Skip to content

Commit

Permalink
V 2.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Singosgu committed Apr 3, 2022
1 parent bb1fee4 commit 0874f19
Show file tree
Hide file tree
Showing 1,836 changed files with 251,887 additions and 0 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.vue linguist-language=python
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
node_modules/
__pycache__/
authorization.txt
authorization.json
db.sqlite3
.idea/
delete.py
*.xlsx
40 changes: 40 additions & 0 deletions Android-APP Build.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
~~~shell
如何配置Cordova环境,请参考
http://www.quasarchs.com/quasar-cli/developing-cordova-apps/preparation

# 进入templates目录,创建src-cordova
quasar mode add cordova
# 进入src-cordova目录
cd src-cordova
# 部署安卓客户端
cordova platform add android
输入app名称为org.greaterwms.app
# 返回templates目录,先启动一次项目来创建gradle文件夹
quasar d -m cordova -T android
Ctrl + c退出
# 修改gradle版本下载distributionUrl,文件在tempates/src-cordova/platforms/android/gradle/wrapper/gradle-wrapper.properties
distributionUrl=https://mirrors.cloud.tencent.com/gradle/gradle-4.10.3-all.zip
# 进入src-cordova目录来安装所需要的插件
cd src-cordova
# 按顺序安装插件
cordova plugin add cordova-plugin-device
cordova plugin add cordova-plugin-battery-status
cordova plugin add cordova-plugin-camera
cordova plugin add com-darryncampbell-cordova-plugin-intent
cordova plugin add https://gitee.com/Singosgu/cordova-plugin-ubx.git
# 修改适配问题的文件,templates\src-cordova\platforms\android\app\src\main\java\org\apache\cordova\camera\FileProvider.java
第21行的android.support.v4.content.FileProvider,修改为androidx.core.content.FileProvider
# 修改适配问题的文件,templates\src-cordova\platforms\android\app\src\main\java\org\apache\cordova\camera\CameraLauncher.java
第42行的android.support.v4.content.FileProvider,修改为androidx.core.content.FileProvider
# 回到templates,再次启动项目
quasar d -m cordova -T android

现在只支持Zebra扫描枪,Zebra扫描枪需要打开广播
Zebra扫描枪配置请看:
https://github.com/Singosgu/GreaterWMS/blob/master/Zebra-Profile.pdf

# 打包apk
quasar build -m android

接下来在dist/cordova/android/apk/release下面可以找到一个未签名的apk,关于怎么签名,自行百度
~~~
71 changes: 71 additions & 0 deletions Centos Build(CN).md
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
~~~shell
su - // 进入管理员账号
yum update
yum upgrade
yum -y install gcc-c++ // 安装依赖
yum install zlib-devel xz-devel bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel libffi-devel gcc make // 安装python依赖
yum install nodejs // 安装nodejs
npm install n -g // 安装n
/usr/local/bin/n 14.18.3 // 升级nodejs
npm install npm -g // 升级npm
npm install yarn -g // 安装yarn
npm install @quasar/cli -g // 安装quasar
npm install cordova -g // 安装cordova
quasar -v // 检查 Quasar 版本
python3 // 查看python版本
cd /usr/src // 进入src
wget https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tgz // 下载python3.9.5
tar -zxvf Python-3.9.5.tgz // 解压
cd Python-3.9.5/ // 进入目录
./configure --enable-optimizations // 编译
make altinstall // 安装
mv /usr/bin/python3 /usr/bin/python3.bak // 备份
ln -s /usr/local/bin/python3.9 /usr/bin/python3 // 建立软连接
mv /usr/bin/pip3 /usr/bin/pip3.bak // 备份
ln -s /usr/local/bin/pip3.9 /usr/bin/pip3 // 建立软连接
python3 // 查看python版本
pip3 list // 查看pip3 是否安装成功
yum install git // 安装git
git clone https://github.com/Singosgu/GreaterWMS.git // 下载 GreaterWMS 从 github
chmod -R 755 GreaterWMS // 提权 GreaterWMS 文件夹
cd GreaterWMS // 进入GreaterWMS文件夹
pip3 install -r requirements.txt
// 有些时候,你安装这些库会出问题,是因为python3版本的问题,不用担心,pip3 install 出错的库就可以了.
/usr/local/bin/daphne -p 8008 greaterwms.asgi:application
// 现在打开浏览器,输入"127.0.0.1:8008",你会看到500错误,恭喜你,你已经可以正常部署接下来的事情了
Ctrl + C // 回到GreaterWMS文件夹
python3 manage.py makemigrations // 数据库生成
python3 manage.py migrate // 数据库迁移
/usr/local/bin/daphne -p 8008 greaterwms.asgi:application
// 现在打开浏览器,输入"127.0.0.1:8008",你会看到项目已经运行了
// 输入 "127.0.0.1:8008/myip", 你会得到你的内网IP,一定记住它
Ctrl + C // 回到GreaterWMS文件夹
cd templates //进入 templates 文件夹
/usr/local/bin/yarn install // 等待Yarn安装完成,其实你也可以npm install ,就是会慢一点
yarn config set registry https://registry.npm.taobao.org/ //更改yarn为国内源
/usr/local/bin/quasar d // 使用quasar命令启动前端页面
// 前端会向 "127.0.0.1:8008"发请求, 在这里我们只是看下项目是不是可以运行
Ctrl + C // 退回到templates文件夹

从2.0.19版本以后,优化了请求地址修改方式,直接修改templates/dist/spa/statics/baseurl.js,中的baseurl和wsurl,就可以成功更改前端请求地址,不再需要做下面的quasar build打包工作。

如果需要修改前端内容,则还需要修改templates/public/statics/baseurl.js中的baseurl和wsurl,然后重新使用quasar build进行打包

cd src/boot // 进入在src/boot文件夹
vim axios_request.js // 我们开始更改请求地址
// 更改 "127.0.0.1" 成你的内网IP, baseurl 是http请求地址 , ws 是 websocket请求地址
按下 Esc 然后输入 ":wq" 去保存修改
// 现在,你已经知道怎么部署和修改请求地址了
/usr/local/bin/quasar build // 需要对修改进行重新打包
cd .. // 回到GreaterWMS文件夹
/usr/local/bin/daphne -b 0.0.0.0 -p 8008 greaterwms.asgi:application
// 现在,打开浏览器,输入 "你的内网IP:8008",你可以看到项目已经运行了

谢天谢地!!!

顺便说一句
1. 你知道了怎么修改请求地址
2. 你也可以按你的喜好,去更改Port
3. 你更可以使用Nginx或者Apache,把项目发布到互联网上
~~~

45 changes: 45 additions & 0 deletions Centos Build(EN).md
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
~~~shell
su - // Enter root
yum update
yum upgrade
yum -y install gcc-c++
yum install zlib-devel xz-devel bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel libffi-devel gcc make
yum install nodejs
npm install n -g
/usr/local/bin/n 14.18.3 // update nodejs
npm install npm -g
npm install yarn -g
npm install @quasar/cli -g
npm install cordova -g
cd /usr/src
wget https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tgz // download python3.9.5
tar -zxvf Python-3.9.5.tgz
cd Python-3.9.5/
./configure --enable-optimizations
make altinstall
mv /usr/bin/python3 /usr/bin/python3.bak // backup python3
ln -s /usr/local/bin/python3.9 /usr/bin/python3
mv /usr/bin/pip3 /usr/bin/pip3.bak // backup pip3
ln -s /usr/local/bin/pip3.9 /usr/bin/pip3
yum install git // install git
git clone https://github.com/Singosgu/GreaterWMS.git // clone GreaterWMS from github
chmod -R 755 GreaterWMS
cd GreaterWMS
pip3 install -r requirements.txt
python3 manage.py makemigrations
python3 manage.py migrate
/usr/local/bin/daphne -p 8008 greaterwms.asgi:application
// open Chrom "127.0.0.1:8008/myip", you will get your internal lan ip, remember it
Ctrl + C // back GreaterWMS folder
cd templates // enter templates folder
/usr/local/bin/yarn install
/usr/local/bin/quasar d // it will start web site
Ctrl + C // back templates folder
cd src/boot
vim axios_request.js // change request baseurl
// change "127.0.0.1" to your internal IP, baseurl is for http, ws is for websocket
// save it
/usr/local/bin/quasar build // build your web site
cd .. // back to GreaterWMS folder
/usr/local/bin/daphne -b 0.0.0.0 -p 8008 greaterwms.asgi:application
// now,you can use "internal IP:8008" to use greaterwms
Binary file not shown.
Binary file not shown.
202 changes: 202 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
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
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the 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
on 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 [yyyy] [name of copyright owner]

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
https://www.56yhz.com

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.
Binary file added Package and sign apk.pdf
Binary file not shown.
Loading

0 comments on commit 0874f19

Please sign in to comment.