diff --git a/NOTICE b/NOTICE new file mode 100644 index 00000000..34590aa0 --- /dev/null +++ b/NOTICE @@ -0,0 +1,13 @@ +Copyright [2021] anji-plus.com + +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 + + https://gitee.com/anji-plus/report/blob/master/LICENSE + +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. \ No newline at end of file diff --git a/README.md b/README.md index c282b849..eb8f20a6 100644 --- a/README.md +++ b/README.md @@ -141,6 +141,16 @@ https://report.anji-plus.com/report-doc/guide/quicklyDevelop.html AJ-Report 使用Druid,版本为1.2.6,如果你觉得你配置都是正常但是数据源测试不过,请尝试降低Druid版本 +## 商业授权 +AJ-Report使用[Apache2.0开源协议](http://www.apache.org/licenses/LICENSE-2.0.html)
+个人和企业,在直接使用、二次开发后商业使用,需要遵守: +- 包含AJ-Report LICENSE文件(授权使用者免费使用AJ-Report专利和知识产权) +- 如果修改了代码,需要在被修改的文件中说明 +- 在修改和有源代码衍生的代码中,需要带有原来代码中的协议,商标 +- 在二次开发后商业发布的产品中,使用了多个开源软件,则必须包含一个Notice文件,在Notice文件中需要带有AJ-Report LICENSE。你可以在Notice中增加自己的许可,但不可以表现为对AJ-Report LICENSE构成更改。 + +如果您需要商业化增值服务,请加下面的微信沟通。 + ## 技术支持 **如有问题,请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** diff --git a/report-core/src/main/assembly/assembly.xml b/report-core/src/main/assembly/assembly.xml index 63268c8d..41bb7844 100755 --- a/report-core/src/main/assembly/assembly.xml +++ b/report-core/src/main/assembly/assembly.xml @@ -1,54 +1,61 @@ - - assembly - - zip - - - true - - - lib/mssqlserver - lib - 0755 - - - lib/kudu - lib - 0755 - - - lib/oracle - lib - 0755 - - - src/main/assembly/bin - bin - 0755 - - - src/main/resources - conf - - bootstrap.yml - - - - target - lib - - aj-report-*.jar - - - *-javadoc.jar - *-sources.jar - - 0755 - - - \ No newline at end of file + + assembly + + zip + + + true + + + lib/mssqlserver + lib + 0755 + + + lib/kudu + lib + 0755 + + + lib/oracle + lib + 0755 + + + src/main/assembly/bin + bin + 0755 + + + src/main/resources + conf + + bootstrap.yml + + + + target + lib + + aj-report-*.jar + + + *-javadoc.jar + *-sources.jar + + 0755 + + + ./../ + / + + LICENSE + + + +