diff --git a/.gitignore b/.gitignore
index 48287bc..34d45ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
__pycache__
j_temp
.idea
-build
+build/*
+!build/installer
+dist
sometest
*.so
*.zip
diff --git a/CoreModels.py b/CoreModels.py
index cfb99d3..450f6fc 100644
--- a/CoreModels.py
+++ b/CoreModels.py
@@ -44,7 +44,7 @@
import qt_material
from jamscreenshot import Slabel
# from aip import AipOcr
-from fbs_runtime.application_context.PyQt5 import ApplicationContext
+# from fbs_runtime.application_context.PyQt5 import ApplicationContext
from pynput import keyboard, mouse
from jamcontroller import ActionController, ActionCondition
from WEBFilesTransmitter import WebFilesTransmitter, WebFilesTransmitterBox, apppath
@@ -52,6 +52,8 @@
from clientFilesTransmitter import ClientFilesTransmitterGroupbox
from jam_transtalater import Translator
import jamresourse
+from pynput.mouse import Controller
+
if PLATFORM_SYS == "win32":
import win32con
@@ -62,6 +64,8 @@
ctypes.windll.shcore.SetProcessDpiAwareness(2)
except Exception as e:
print(e)
+ import pynput.keyboard._win32
+ import pynput.mouse._win32
if PLATFORM_SYS == "darwin":
import pynput.keyboard._darwin
import pynput.mouse._darwin
@@ -69,7 +73,7 @@
import pynput.keyboard._xorg
import pynput.mouse._xorg
-VERSON = "0.14.0B"
+VERSON = "0.14.1B"
class JHotkey(QThread):
@@ -324,6 +328,7 @@ def __init__(self, parent):
self.showrect = Transparent_windows()
self.x = 0
self.y = 0
+ self.using_area = False
self.w = self.maxw = QApplication.desktop().width() // 2 * 2
self.h = self.maxh = QApplication.desktop().height() // 2 * 2
@@ -352,6 +357,19 @@ def init_arearecord(self):
QStandardPaths.MoviesLocation) + "/Jam_screenrecord")
def area_recording(self):
+ screen_number = 0
+ if not self.using_area:
+ if QApplication.desktop().screenCount()>1:
+ screen=self.search_in_which_screen()
+ else:
+ screen=QApplication.primaryScreen()
+ ssize = screen.geometry()
+ self.w = self.maxw = ssize.width() // 2 * 2
+ self.h = self.maxh = ssize.height() // 2 * 2
+
+ desktop = QApplication.desktop()
+ screen_number = desktop.screenNumber(desktop.cursor().pos())
+ print("screen_number",screen_number)
self.codec = 'libx264 '
profile = ' high444 -level 5.1 '
try:
@@ -456,7 +474,7 @@ def area_recording(self):
self.y,
self.w,
self.h)
- video = ' -thread_queue_size 16 -f gdigrab -rtbufsize 500M ' + area + ' -i desktop '
+ video = ' -thread_queue_size 16 -f gdigrab -rtbufsize 500M ' + area + ' -i desktop{} '.format(f":{screen_number}")
else:
video = " -video_size {}x{} -f x11grab -draw_mouse {} -i :0.0+{},{} ".format(self.w, self.h,
self.mouse, self.x,
@@ -547,7 +565,16 @@ def area_recording(self):
+ audio
+ out_file
+ ' -y')
-
+ def search_in_which_screen(self):
+ mousepos=Controller().position
+ screens = QApplication.screens()
+ secondscreen = QApplication.primaryScreen()
+ for i in screens:
+ rect=i.geometry().getRect()
+ if mousepos[0]in range(rect[0],rect[0]+rect[2]) and mousepos[1]in range(rect[1],rect[1]+rect[3]):
+ secondscreen = i
+ break
+ return secondscreen
# -framerate 5 -draw_mouse 1 -show_region 1 显示截取区域 -i title={窗口名称} 用-framerate在macos下报错 用-r代替
def recordchange(self):
if self.waiting:
@@ -3794,6 +3821,7 @@ def getpix_result_callback(self,area,pix):
def set_area_callback(self,area):
print('setting recarea',area)
self.recorder.x , self.recorder.y, self.recorder.w,self.recorder.h = area
+ self.recorder.using_area = True
def screen_shot_end_callback(self,pic):
self.setup_ui_screenshot()
@@ -5695,8 +5723,9 @@ def main():
global jamtools, ffmpeg_path, documents_path, temp_path, iconpng, paypng, transformater, \
translator
start_t = time.time()
- appctxt = ApplicationContext()
- single_instance_check = StartUpChecker(appctxt.app)
+ # appctxt = ApplicationContext()
+ app = QApplication(sys.argv)
+ single_instance_check = StartUpChecker(app)
ffmpeg_path = os.path.join(apppath, 'bin', PLATFORM_SYS)
documents_path = QStandardPaths.writableLocation(QStandardPaths.DocumentsLocation)
@@ -5718,7 +5747,7 @@ def main():
jamtools.init_rec_con_thread.start()
jamtools.statusBar().showMessage('初始化用时：%f' % float(time.time() - start_t))
print('init_swindowtime:', time.time() - start_t)
- sys.exit(appctxt.app.exec_())
+ sys.exit(app.exec_())
if __name__ == '__main__':
diff --git a/README.md b/README.md
index 79958fa..06a4da7 100644
--- a/README.md
+++ b/README.md
@@ -145,7 +145,7 @@ $其他功能：划屏提字：打开软件后可以在任何界面(图片也可
│ jamroll_screenshot.py //滚动截屏模块
│ jampublic.py //一些非常常用的公共引用类/方法,如翻译文字识别线程类等
│ jamresourse.py //转化的资源文件
-│ jamtoolsbuild.py //一键构建脚本,调用该脚本即可自动分析项目引用,自动配置项目文件,自动编译/打包等
+│ jamtoolsbuild.py //一键构建脚本,调用该脚本即可自动分析项目引用,自动配置项目文件,自动编译/打包等, 基于fbs，后续将移除
│ setjam.py //附加编译脚本,如在构建脚本中设置了编译,则会调用该脚本将所有库转化为c文件后编译,需要Cython支持
| 以下几个库文件是(作者自行编译的)不同平台下的缩略版opencv库(10M+),现在默认clone的项目将不会包含这些文件(因为太大了clone起来太慢),已经放在release里面了,要小一点的文件的话就自己去下载,或者直接安装完全版的opencv-contrib-python==3.4.2.17(70M+)..
│ \ cv2.cp37-win_amd64.pyd //windows下编译的opencv库,如需扩展功能,请自行安装opencv-contrib-python==3.4.2.17
@@ -305,4 +305,17 @@ opencv-contrib-python # 如果需要更小体积的cv2,则可以从[这里](http
此外,本软件多媒体处理能力主要依赖于[ffmpeg库](https://ffmpeg.org/),需要自行下载[ffmpeg](https://ffmpeg.org/)(用于录屏和多媒体处理)和[gifsicle](http://www.lcdf.org/gifsicle/)(用于gif压缩)可执行文件放到bin目录对应操作系统的文件夹下,方可使用对应功能.
-配置好以上环境后,可以通过运行`jamtoolsbuild.py`文件一键打包对应平台下的包,然后通过fbs install命令构建安装程序,详情请看[这里](https://github.com/mherrmann/fbs-tutorial)
+### 打包安装程序
+
+> 原本的打包基于fbs库，但是高版本的fbs开始收费了，所以换成了`cx_Freeze`进行打包(感觉更好用了，白嫖真爽！)
+
+配置好以上环境后,可以通过运行以下命令打包为安装目录的文件夹：
+```shell
+python setup.py build
+```
+window下打包出来安装目录之后，可以使用nsis打包为安装程序，提供了一个安装程序脚本到`.\build\installer`中，具体用法可以参考[nsis教程](https://nsis.sourceforge.io/Main_Page)
+
+TODO:
+- 其他平台使用`cx_Freeze`打包还没有测试
+- `cx_Freeze`本身好像支持打包为安装程序，但是不能定义安装页面，后面再看看能不能使用
+
diff --git a/src/installer/windows/Installer.nsi b/build/installer/Installer.nsi
similarity index 92%
rename from src/installer/windows/Installer.nsi
rename to build/installer/Installer.nsi
index 3fef925..7500c3d 100644
--- a/src/installer/windows/Installer.nsi
+++ b/build/installer/Installer.nsi
@@ -4,8 +4,8 @@ SetCompressor /SOLID LZMA
InstallDir "$PROGRAMFILES64\JamTools"
;InstallDirRegKey HKCU "Software\JamTools" "$PROGRAMFILES64\JamTools"
!define PRODUCT_NAME "JamTools"
-!define PRODUCT_VERSION "0.12.201211Alpha"
-
+!define PRODUCT_VERSION "0.14.0B"
+Unicode True
;--------------------------------
;Perform Machine-level install, if possible
@@ -69,7 +69,7 @@ FunctionEnd
;General
Name "JamTools"
- OutFile "..\JamTools${PRODUCT_VERSION}Setup.exe"
+ OutFile "..\JamTools${PRODUCT_VERSION}Setup_for_windows.exe"
;--------------------------------
;Interface Settings
@@ -79,11 +79,19 @@ FunctionEnd
;--------------------------------
;Pages
!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\Icon.ico"
- !define MUI_WELCOMEPAGE_TEXT "JamToolsװĵϣ$\r$\nճԼõĹܼϣһСɡ$\nҪ:()ʶ𡢷롢ͼʶ¼(֧Զ)ʽת(֧ͼƬƵļüƴӡѹת롢ȡϲ)¼/()š()ȹ$\r$\nȫѣϽڶδҵ;$\r$\n$\r$\n$\r$\nClick Next to continue."
+ !define MUI_WELCOMEPAGE_TEXT "JamToolsװĵϣ$\r$\n$\r$\n$\r$\nClick Next to continue."
!define MUI_DIRECTORYPAGE_TEXT_TOP "ѡװλã鰲װϵͳ(Ϊ̫...) "
!define MUI_
!insertmacro MUI_PAGE_WELCOME
-
+ ; ҳ
+ !define MUI_PAGE_CUSTOMFUNCTION_SHOW LicenseShow
+!insertmacro MUI_PAGE_LICENSE "..\JamTools\LICENSE"
+Function LicenseShow
+
+FunctionEnd
+
+
+
; װĿ¼ѡҳ
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
@@ -196,5 +204,5 @@ FunctionEnd
Function LaunchLink
!addplugindir "."
- ShellExecAsUser::ShellExecAsUser "open" "$SMPROGRAMS\JamTools.lnk"
+ ExecShell "" "$InstDir\JamTools.exe"
FunctionEnd
diff --git a/build/installer/ShellExecAsUser.dll b/build/installer/ShellExecAsUser.dll
new file mode 100644
index 0000000..2bf1d0c
Binary files /dev/null and b/build/installer/ShellExecAsUser.dll differ
diff --git a/build/installer/killer.dll b/build/installer/killer.dll
new file mode 100644
index 0000000..89f431b
Binary files /dev/null and b/build/installer/killer.dll differ
diff --git a/build/installer/readme.txt b/build/installer/readme.txt
new file mode 100644
index 0000000..aa63f60
--- /dev/null
+++ b/build/installer/readme.txt
@@ -0,0 +1 @@
+Move killer.dll && ShellExecAsUser.dll to your `:NSIS\Plugins\x86-unicode`
diff --git a/icon.ico b/icon.ico
new file mode 100644
index 0000000..1c1abfb
Binary files /dev/null and b/icon.ico differ
diff --git a/src/main/icons/base/512.png b/icon.png
similarity index 100%
rename from src/main/icons/base/512.png
rename to icon.png
diff --git a/jamtoolsbuild.py b/jamtoolsbuild.py
index 818ff95..e8dfc32 100644
--- a/jamtoolsbuild.py
+++ b/jamtoolsbuild.py
@@ -160,6 +160,7 @@
freezer = subprocess.Popen('fbs freeze {}'.format("--debug" if Debug else ""), shell=True, stdin=subprocess.PIPE,
stdout=subprocess.PIPE)
freezer.wait()
+ print("freeze end")
if PLATFORM_SYS != "win32":
a = input("是否打包为安装文件,Y/N:(回车默认Y)")
if "y" in a.lower() or len(a) == 0:
@@ -175,8 +176,9 @@
if os.path.exists("target/JamTools/cv2"):
print("replace cv2 module")
shutil.rmtree("target/JamTools/cv2")
- os.mkdir("target/JamTools/cv2")
- shutil.copy2("opencv_world341.dll", "target/JamTools/cv2/opencv_world341.dll")
- shutil.copy2("cv2.cp37-win_amd64.pyd", "target/JamTools/cv2/cv2.cp37-win_amd64.pyd")
+ os.mkdir("target/JamTools/cv2")
+ shutil.copy2("opencv_world341.dll", "target/JamTools/cv2/opencv_world341.dll")
+ shutil.copy2("cv2.cp37-win_amd64.pyd", "target/JamTools/cv2/cv2.cp37-win_amd64.pyd")
print('finished all')
+ time.sleep(2)
diff --git a/main.py b/main.py
index db1c602..1df3903 100644
--- a/main.py
+++ b/main.py
@@ -1,7 +1,7 @@
# !usr/bin/python3
# -*- coding: utf-8 -*-
-####### 本文件由jamtoolsbuild.py 打包脚本自动生成 ######
+####### 本文件由setup.py 打包脚本自动生成 ######
import pynput.keyboard
import pynput.mouse
@@ -32,7 +32,6 @@
from qt_material import apply_stylesheet,list_themes
import qt_material
from jamscreenshot import Slabel
-import fbs_runtime.application_context.PyQt5
import pynput
from jamcontroller import ActionController, ActionCondition
from WEBFilesTransmitter import WebFilesTransmitter, WebFilesTransmitterBox, apppath
@@ -80,5 +79,5 @@
main()
-####### 本文件由jamtoolsbuild.py 打包脚本自动生成 ######
+####### 本文件由setup.py 打包脚本自动生成 ######
diff --git a/requirement.txt b/requirement.txt
index 05232c2..6182a03 100644
--- a/requirement.txt
+++ b/requirement.txt
@@ -1,7 +1,6 @@
Wheel
Pillow
pynput
-fbs==0.9.0
qrcode
requests==2.27
urllib3==1.25.8
@@ -22,4 +21,4 @@ setuptools==50.3.0
chardet
comtypes
opencv-contrib-python
-
+cx_Freeze
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..bc66e1a
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,135 @@
+from cx_Freeze import setup, Executable
+import numpy
+import os
+import sys
+from cx_Freeze import setup, Executable
+# from cx_Freeze.util import get_default_include_path
+from cx_Freeze.finder import ModuleFinder
+import shutil
+
+
+jamfilelist = ["CoreModels", "jamcontroller", "WEBFilesTransmitter", "clientFilesTransmitter",
+ "jamscreenshot", "jampublic", "jamroll_screenshot", "Logger", "jamspeak",
+ "jamWidgets", "jam_transtalater","PaddleOCRModel/PaddleOCRModel"]
+print("说明:main.py为存放引入库的文件(无需管), cx_Freeze打包输出到build目录下.\n"
+ "运行本文件打包时,会自动解析所有jamfilelist中源码的引入库,"
+ "并将所有需要的库格式化后写入main.py文件中,从而让pyinstaller可以找到(否则可能有找不到库的错误)"
+ "同时会自动配置scr项目目录,然后通过命令行运行打包程序实现自动打包,如需生成安装文件Windows下需要nsis环境,请自行探索..\n"
+ "通过更改下面的WithCompile 和Debug变量可以调整是否编译和是否debug模式.\n"
+ "需要编译时会将所有源码文件编译为c然后编译为pyd文件,可以实现源码保护,而且运行速度略有提升,需要自行配置好c和cython环境\n"
+ "debug模式下运行打包文件将会有命令行窗口")
+if __name__ == "__main__":
+ import os
+ import sys
+ import shutil
+ import subprocess, setuptools
+
+ # from CoreModels import VERSON
+ WithCompile = 0 # 是否编译
+ Debug = 0 # 是否debug模式
+ VERSON = "0.14.1B"
+
+ if WithCompile:
+ Compiler = subprocess.Popen('python setjam.py build_ext --inplace', shell=True,stderr=subprocess.PIPE)
+ Compiler.wait()
+ error=Compiler.stderr.read().decode("utf-8")
+ print(">>>>>{}\n><<<<<<".format(error))
+ if "error"in error:
+ raise Exception("Compiler fail!\n{}".format(error))
+ if sys.platform == "win32":
+ ext = ".pyd"
+ suffix = ".cp37-win_amd64"
+ else:
+ ext = ".so"
+ suffix = ".cpython-37m-darwin"
+ else:
+ ext = ".py"
+ suffix = ""
+
+ ### gen main.py
+ file_tips = "\n####### 本文件由setup.py 打包脚本自动生成 ######\n\n"
+ with open('main.py', "w", encoding="utf-8") as mainf:
+ importfilelist = ["# !usr/bin/python3\n","# -*- coding: utf-8 -*-\n",
+ file_tips,"import pynput.keyboard\n", "import pynput.mouse\n"]
+ for file in jamfilelist:
+ print("explaining {}".format(file))
+ with open("{}.py".format(file), "r", encoding="utf-8") as soursef:
+ line = soursef.readline()
+ while line:
+ if line[:6] == "import" or (line[:4] == "from" and "import" in line):
+ if "PyQt5" in line or "pynput" in line:
+ if "from" in line:
+ line = "import " + line.split(" ")[1] + "\n"
+ elif " as " in line:
+ line = line.split(" as ")[0] + "\n"
+ if "jampublic" in line: line = "import jampublic\n"
+ while line[-2] == "\\": # 多行
+ if line not in importfilelist:
+ importfilelist.append(line)
+ line = soursef.readline()
+ if line not in importfilelist:
+ importfilelist.append(line)
+ line = soursef.readline()
+
+ mainf.writelines(importfilelist)
+ mainf.writelines(["from CoreModels import main\n", "main()\n\n",file_tips])
+
+
+
+
+ # 需要包含的资源目录和文件
+ if sys.platform=='win32':
+ bin_files = "bin/win32"
+ else:
+ bin_files = "bin/linux" if sys.platform=='linux' else "bin/darwin"
+
+ include_files = [
+ (bin_files,"lib/"+bin_files),
+ ("html/","lib/html"),
+ ("LICENSE","LICENSE")
+ ]
+ if sys.platform == "win32":
+ include_files.extend(
+ [("screen-capture-recorder-x64.dll","screen-capture-recorder-x64.dll"),
+ ("audio_sniffer-x64.dll","audio_sniffer-x64.dll")]
+ )
+
+ # exit()
+ # Dependencies are automatically detected, but it might need
+ # fine tuning.
+ build_options = {'packages': [],
+ 'zip_include_packages':["PyQt5"],
+ 'excludes': ["setuptools","tk8.6",
+ "tkinter","Cython","fbs_runtime",
+ "lib2to3","multiprocessing","packaging",
+ "pkg_resources","test",
+ ],
+ "include_files": include_files,
+ }
+
+ import sys
+ if Debug:
+ base = None
+ elif sys.platform=='win32':
+ base = 'Win32GUI'
+ else:
+ base = None
+
+ executables = [
+ Executable('main.py', base=base, target_name = 'Jamtools',icon="./icon.ico")
+ ]
+
+ setup(name='JamTools',
+ version = VERSON,
+ description = 'JamTools是一个完全开源的跨平台的小工具集类软件，支持Windows7/8/10/11、Macos、ubuntu系统(其他系统可以直接从源码编译打包)。包含了(滚动/区域)截屏、录屏、文字识别、多种语言互译、多媒体格式转换、鼠标键盘动作录制播放、局域网文件传输、聊天机器人等功能。github链接：https://github.com/fandesfyf/JamTools',
+ options = {'build_exe': build_options,},
+ executables = executables)
+ for filename in os.listdir("./build/"):
+ if filename.startswith("exe."):
+ destination_dir = f"./build/Jamtools"
+ if os.path.exists(destination_dir):
+ shutil.rmtree(destination_dir)
+ shutil.copytree(f"./build/{filename}", destination_dir)
+ print(f"move ./build/{filename} -> {destination_dir}")
+ shutil.move("./build/Jamtools/lib/PyQt5/Qt/Qt5/plugins", "./build/Jamtools/lib/PyQt5/Qt/plugins")
+
diff --git a/src/build/settings/base.json b/src/build/settings/base.json
deleted file mode 100644
index 3dd9088..0000000
--- a/src/build/settings/base.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "app_name": "JamTools",
- "author": "Fandes",
- "main_module": "src/main/python/main.py",
- "version": "0.13",
- "hidden_imports": ["qt_material","pynput.keyboard._darwin","pynput.mouse._darwin"]
-}
diff --git a/src/build/settings/linux.json b/src/build/settings/linux.json
deleted file mode 100644
index 7a64c95..0000000
--- a/src/build/settings/linux.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "categories": "Utility;",
- "description": "",
- "author_email": "",
- "url": ""
-}
\ No newline at end of file
diff --git a/src/build/settings/mac.json b/src/build/settings/mac.json
deleted file mode 100644
index f7bd610..0000000
--- a/src/build/settings/mac.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "mac_bundle_identifier": ""
-}
\ No newline at end of file
diff --git a/src/main/icons/Icon.ico b/src/main/icons/Icon.ico
deleted file mode 100644
index 2ca2b9c..0000000
Binary files a/src/main/icons/Icon.ico and /dev/null differ
diff --git a/src/main/icons/README.md b/src/main/icons/README.md
deleted file mode 100644
index c6c4194..0000000
--- a/src/main/icons/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-This directory contains the icons that are displayed for your app. Feel free to
-change them.
-
-The difference between the icons on Mac and the other platforms is that on Mac,
-they contain a ~5% transparent margin. This is because otherwise they look too
-big (eg. in the Dock or in the app switcher).
-
-You can create Icon.ico from the .png files with
-[an online tool](http://icoconvert.com/Multi_Image_to_one_icon/).
\ No newline at end of file
diff --git a/src/main/icons/linux/512.png b/src/main/icons/linux/512.png
deleted file mode 100644
index 722c5d7..0000000
Binary files a/src/main/icons/linux/512.png and /dev/null differ
diff --git a/src/main/icons/mac/512.png b/src/main/icons/mac/512.png
deleted file mode 100644
index 722c5d7..0000000
Binary files a/src/main/icons/mac/512.png and /dev/null differ
diff --git a/src/main/python/.gitkeep b/src/main/python/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/src/main/resources/base/LICENSE b/src/main/resources/base/LICENSE
deleted file mode 100644
index 2a06abd..0000000
--- a/src/main/resources/base/LICENSE
+++ /dev/null
@@ -1,62 +0,0 @@
-:(JamTools)Ϊȫṩ,Ͻڶδҵ;;ȫ뿪Դ,GitHubĿַ:https://github.com/fandesfyf/JamTools
-
-ΨһԴΪGitHubҳCSDNԼŹں,κԴİװļ֤Ƿ۸,Դظ°汾JamTools,κԴİװļ߸Ų!
-
-JamToolsѭԴЭ Apache-2.0,:
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- 1. Definitions.
- "License" shall mean the terms and conditions for use, reproduction,and distribution as defined by Sections 1 through 9 of this document.
- "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
- "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
- "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
- "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
- "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
- "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
- "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes f this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, he Work and Derivative Works thereof.
- "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
- "Contributor" shall mean Licensor and any individual or Legal Entity n behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
- (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
-
- You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
-
- Copyright 2022 Fandes
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
diff --git a/src/main/resources/base/audio_sniffer-x64.dll b/src/main/resources/base/audio_sniffer-x64.dll
deleted file mode 100644
index 367a378..0000000
Binary files a/src/main/resources/base/audio_sniffer-x64.dll and /dev/null differ
diff --git a/src/main/resources/base/html/favicon.ico b/src/main/resources/base/html/favicon.ico
deleted file mode 100644
index 9156db4..0000000
Binary files a/src/main/resources/base/html/favicon.ico and /dev/null differ
diff --git a/src/main/resources/base/html/fonts/FontAwesome.otf b/src/main/resources/base/html/fonts/FontAwesome.otf
deleted file mode 100644
index 401ec0f..0000000
Binary files a/src/main/resources/base/html/fonts/FontAwesome.otf and /dev/null differ
diff --git a/src/main/resources/base/html/fonts/fontawesome-webfont.eot b/src/main/resources/base/html/fonts/fontawesome-webfont.eot
deleted file mode 100644
index e9f60ca..0000000
Binary files a/src/main/resources/base/html/fonts/fontawesome-webfont.eot and /dev/null differ
diff --git a/src/main/resources/base/html/fonts/fontawesome-webfont.svg b/src/main/resources/base/html/fonts/fontawesome-webfont.svg
deleted file mode 100644
index 855c845..0000000
--- a/src/main/resources/base/html/fonts/fontawesome-webfont.svg
+++ /dev/null
@@ -1,2671 +0,0 @@
-
-
-
diff --git a/src/main/resources/base/html/fonts/fontawesome-webfont.ttf b/src/main/resources/base/html/fonts/fontawesome-webfont.ttf
deleted file mode 100644
index 35acda2..0000000
Binary files a/src/main/resources/base/html/fonts/fontawesome-webfont.ttf and /dev/null differ
diff --git a/src/main/resources/base/html/fonts/fontawesome-webfont.woff b/src/main/resources/base/html/fonts/fontawesome-webfont.woff
deleted file mode 100644
index 400014a..0000000
Binary files a/src/main/resources/base/html/fonts/fontawesome-webfont.woff and /dev/null differ
diff --git a/src/main/resources/base/html/fonts/fontawesome-webfont.woff2 b/src/main/resources/base/html/fonts/fontawesome-webfont.woff2
deleted file mode 100644
index 4d13fc6..0000000
Binary files a/src/main/resources/base/html/fonts/fontawesome-webfont.woff2 and /dev/null differ
diff --git a/src/main/resources/base/html/img/12345.jpg b/src/main/resources/base/html/img/12345.jpg
deleted file mode 100644
index 3e854ad..0000000
Binary files a/src/main/resources/base/html/img/12345.jpg and /dev/null differ
diff --git a/src/main/resources/base/html/index.html b/src/main/resources/base/html/index.html
deleted file mode 100644
index 302e007..0000000
--- a/src/main/resources/base/html/index.html
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
-
-
- 登录
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-