Skip to content

Commit bdf5674

Browse files
robinhood-jimrobinhood-jim
committed
license util scan periodically!
1 parent 14219d1 commit bdf5674

File tree

16 files changed

+694
-345
lines changed

16 files changed

+694
-345
lines changed

‎LICENSE

Lines changed: 199 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,220 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
129
MIT License
230

31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
335
Copyright (c) 2021-present Archer
436

37+
"Work" shall mean the work of authorship, whether in Source or
38+
Object form, made available under the License, as indicated by a
39+
copyright notice that is included in or attached to the work
40+
(an example is provided in the Appendix below).
541
Permission is hereby granted, free of charge, to any person obtaining a copy
642
of this software and associated documentation files (the "Software"), to deal
743
in the Software without restriction, including without limitation the rights
844
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
945
copies of the Software, and to permit persons to whom the Software is
1046
furnished to do so, subject to the following conditions:
1147

48+
"Derivative Works" shall mean any work, whether in Source or Object
49+
form, that is based on (or derived from) the Work and for which the
50+
editorial revisions, annotations, elaborations, or other modifications
51+
represent, as a whole, an original work of authorship. For the purposes
52+
of this License, Derivative Works shall not include works that remain
53+
separable from, or merely link (or bind by name) to the interfaces of,
54+
the Work and Derivative Works thereof.
1255
The above copyright notice and this permission notice shall be included in all
1356
copies or substantial portions of the Software.
1457

58+
"Contribution" shall mean any work of authorship, including
59+
the original version of the Work and any modifications or additions
60+
to that Work or Derivative Works thereof, that is intentionally
61+
submitted to Licensor for inclusion in the Work by the copyright owner
62+
or by an individual or Legal Entity authorized to submit on behalf of
63+
the copyright owner. For the purposes of this definition, "submitted"
64+
means any form of electronic, verbal, or written communication sent
65+
to the Licensor or its representatives, including but not limited to
66+
communication on electronic mailing lists, source code control systems,
67+
and issue tracking systems that are managed by, or on behalf of, the
68+
Licensor for the purpose of discussing and improving the Work, but
69+
excluding communication that is conspicuously marked or otherwise
70+
designated in writing by the copyright owner as "Not a Contribution."
71+
72+
"Contributor" shall mean Licensor and any individual or Legal Entity
73+
on behalf of whom a Contribution has been received by Licensor and
74+
subsequently incorporated within the Work.
75+
76+
2. Grant of Copyright License. Subject to the terms and conditions of
77+
this License, each Contributor hereby grants to You a perpetual,
78+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
79+
copyright license to reproduce, prepare Derivative Works of,
80+
publicly display, publicly perform, sublicense, and distribute the
81+
Work and such Derivative Works in Source or Object form.
82+
83+
3. Grant of Patent License. Subject to the terms and conditions of
84+
this License, each Contributor hereby grants to You a perpetual,
85+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
86+
(except as stated in this section) patent license to make, have made,
87+
use, offer to sell, sell, import, and otherwise transfer the Work,
88+
where such license applies only to those patent claims licensable
89+
by such Contributor that are necessarily infringed by their
90+
Contribution(s) alone or by combination of their Contribution(s)
91+
with the Work to which such Contribution(s) was submitted. If You
92+
institute patent litigation against any entity (including a
93+
cross-claim or counterclaim in a lawsuit) alleging that the Work
94+
or a Contribution incorporated within the Work constitutes direct
95+
or contributory patent infringement, then any patent licenses
96+
granted to You under this License for that Work shall terminate
97+
as of the date such litigation is filed.
98+
99+
4. Redistribution. You may reproduce and distribute copies of the
100+
Work or Derivative Works thereof in any medium, with or without
101+
modifications, and in Source or Object form, provided that You
102+
meet the following conditions:
103+
104+
(a) You must give any other recipients of the Work or
105+
Derivative Works a copy of this License; and
106+
107+
(b) You must cause any modified files to carry prominent notices
108+
stating that You changed the files; and
109+
110+
(c) You must retain, in the Source form of any Derivative Works
111+
that You distribute, all copyright, patent, trademark, and
112+
attribution notices from the Source form of the Work,
113+
excluding those notices that do not pertain to any part of
114+
the Derivative Works; and
115+
116+
(d) If the Work includes a "NOTICE" text file as part of its
117+
distribution, then any Derivative Works that You distribute must
118+
include a readable copy of the attribution notices contained
119+
within such NOTICE file, excluding those notices that do not
120+
pertain to any part of the Derivative Works, in at least one
121+
of the following places: within a NOTICE text file distributed
122+
as part of the Derivative Works; within the Source form or
123+
documentation, if provided along with the Derivative Works; or,
124+
within a display generated by the Derivative Works, if and
125+
wherever such third-party notices normally appear. The contents
126+
of the NOTICE file are for informational purposes only and
127+
do not modify the License. You may add Your own attribution
128+
notices within Derivative Works that You distribute, alongside
129+
or as an addendum to the NOTICE text from the Work, provided
130+
that such additional attribution notices cannot be construed
131+
as modifying the License.
132+
133+
You may add Your own copyright statement to Your modifications and
134+
may provide additional or different license terms and conditions
135+
for use, reproduction, or distribution of Your modifications, or
136+
for any such Derivative Works as a whole, provided Your use,
137+
reproduction, and distribution of the Work otherwise complies with
138+
the conditions stated in this License.
139+
140+
5. Submission of Contributions. Unless You explicitly state otherwise,
141+
any Contribution intentionally submitted for inclusion in the Work
142+
by You to the Licensor shall be under the terms and conditions of
143+
this License, without any additional terms or conditions.
144+
Notwithstanding the above, nothing herein shall supersede or modify
145+
the terms of any separate license agreement you may have executed
146+
with Licensor regarding such Contributions.
147+
148+
6. Trademarks. This License does not grant permission to use the trade
149+
names, trademarks, service marks, or product names of the Licensor,
150+
except as required for reasonable and customary use in describing the
151+
origin of the Work and reproducing the content of the NOTICE file.
152+
153+
7. Disclaimer of Warranty. Unless required by applicable law or
154+
agreed to in writing, Licensor provides the Work (and each
155+
Contributor provides its Contributions) on an "AS IS" BASIS,
156+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
157+
implied, including, without limitation, any warranties or conditions
158+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
159+
PARTICULAR PURPOSE. You are solely responsible for determining the
160+
appropriateness of using or redistributing the Work and assume any
161+
risks associated with Your exercise of permissions under this License.
162+
163+
8. Limitation of Liability. In no event and under no legal theory,
164+
whether in tort (including negligence), contract, or otherwise,
165+
unless required by applicable law (such as deliberate and grossly
166+
negligent acts) or agreed to in writing, shall any Contributor be
167+
liable to You for damages, including any direct, indirect, special,
168+
incidental, or consequential damages of any character arising as a
169+
result of this License or out of the use or inability to use the
170+
Work (including but not limited to damages for loss of goodwill,
171+
work stoppage, computer failure or malfunction, or any and all
172+
other commercial damages or losses), even if such Contributor
173+
has been advised of the possibility of such damages.
174+
175+
9. Accepting Warranty or Additional Liability. While redistributing
176+
the Work or Derivative Works thereof, You may choose to offer,
177+
and charge a fee for, acceptance of support, warranty, indemnity,
178+
or other liability obligations and/or rights consistent with this
179+
License. However, in accepting such obligations, You may act only
180+
on Your own behalf and on Your sole responsibility, not on behalf
181+
of any other Contributor, and only if You agree to indemnify,
182+
defend, and hold each Contributor harmless for any liability
183+
incurred by, or claims asserted against, such Contributor by reason
184+
of your accepting any such warranty or additional liability.
185+
186+
END OF TERMS AND CONDITIONS
187+
188+
APPENDIX: How to apply the Apache License to your work.
189+
190+
To apply the Apache License to your work, attach the following
191+
boilerplate notice, with the fields enclosed by brackets "{}"
192+
replaced with your own identifying information. (Don't include
193+
the brackets!) The text should be enclosed in the appropriate
194+
comment syntax for the file format. We also recommend that a
195+
file or class name and description of purpose be included on the
196+
same "printed page" as the copyright notice for easier
197+
identification within third-party archives.
198+
199+
Copyright {yyyy} {name of copyright owner}
200+
201+
Licensed under the Apache License, Version 2.0 (the "License");
202+
you may not use this file except in compliance with the License.
203+
You may obtain a copy of the License at
204+
205+
http://www.apache.org/licenses/LICENSE-2.0
206+
207+
Unless required by applicable law or agreed to in writing, software
208+
distributed under the License is distributed on an "AS IS" BASIS,
209+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
210+
See the License for the specific language governing permissions and
211+
limitations under the License.
212+
15213
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16214
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17215
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18216
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19217
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20218
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21219
SOFTWARE.
220+

‎README.zh.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# SimpleJavaFrame
2-
1+
# Simple Java Frame V1.0
2+
简易支持只定义ORM,可以灵活整合JPA，mybatis_plus,提供大数据相关工具类
33
[![Build Status](https://api.travis-ci.com/robinhood-jim/JavaFramework.svg?branch=master)](https://app.travis-ci.com/github/robinhood-jim/JavaFramework)
44
[![CircleCI](https://circleci.com/gh/robinhood-jim/JavaFramework.svg?style=svg)](https://circleci.com/gh/robinhood-jim/JavaFramework)
55
![license](https://img.shields.io/badge/license-Apache--2.0-green.svg)
@@ -13,9 +13,10 @@
1313
目前框架由6个模块组成
1414

1515
1.Core：核心包，包含Model/DAO/Service及ORM的基础类及DB Dialect。数据库Dump和Import的工具包等，支持JAVA基本框架的内容
16+
增加License 管理功能，支持引用核心包后带上许可验证功能
1617
2.Common：通用工具包，包含统一资源访问的接口定义和Apache VFS与本地资源的实现，基于poi的xls读取和生成工具（支持Stream），
1718
3.hadooptool：包含大数据相关的基本工具类和统一资源访问的大数据实现
18-
4.web：基于strut2和SpringMVC的基础类及Spring message的基础类（支持多国语言）
19+
4.web：基于SpringMVC的基础类及Spring message的基础类（支持多国语言）
1920
5.metadata 基于统一资源访问的关系数据源与NoSql数据源的元数据数据探索和管理；
2021
6.estool 通用的ElasticSearch查询访问工具类，能自动感知es下的所有索引，基于restapi
2122

@@ -34,7 +35,7 @@ core与common工程由ProGuard进行混淆保护
3435

3536
开发说明
3637

37-
I.Model:支持JPA和自定义的Annotation,可支持符合主键，自增长字段保存后自动回填相应字段
38+
I.自定义Model:支持JPA和自定义的Annotation,可支持符合主键，自增长字段保存后自动回填相应字段
3839

3940
1.Example:
4041
包: core/src/test/java/com/robin/core/test/model
@@ -70,7 +71,7 @@ core与common工程由ProGuard进行混淆保护
7071

7172
符合主键,见例子 core/src/test/java/com/robin/core/test/model/TestMutiPK
7273

73-
II.DAO层:
74+
II.自定义得DAO层:
7475
使用 com.robin.core.base.dao.JdbcDao,没有特殊业务需要，无需另外创建
7576
1.配置式SQL查询
7677
类似于mybatis的配置式查询，简化了相应的配置，去掉了Map转Model的操作，可支持PreparedStatement与NamedPreparedStatment，
@@ -89,7 +90,7 @@ core与common工程由ProGuard进行混淆保护
8990
factory.setXmlConfigPath(queryConfigPath);
9091
return factory;
9192
}
92-
1.2 配置文件
93+
1.2 SQL配置文件
9394
在xmlConfigPath 目录下，添加任意xml文件
9495
内容如下
9596
<SQLSCRIPT ID="$_GETCODESET">
@@ -111,7 +112,7 @@ core与common工程由ProGuard进行混淆保护
111112
SybaseSqlGen Sybase
112113

113114
114-
III.Service层
115+
III.自定义Service层
115116
实例: core/src/test/java/com/robin/core/test/service
116117
主要方法
117118
---------------------------------------------------------------------------------
@@ -142,4 +143,4 @@ core与common工程由ProGuard进行混淆保护
142143

143144
VI.web工程
144145
基于传统配置式 spring maven 项目 example/config-example
145-
基于spring boot和 cloud的微服务架构 webui
146+
基于spring boot和 cloud的微服务架构 webui，引擎使用thymeleaf

‎common/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@
287287
<groupId>org.bouncycastle</groupId>
288288
<artifactId>bcprov-jdk15on</artifactId>
289289
<version>1.67</version>
290+
<optional>true</optional>
290291
</dependency>
291292
<dependency>
292293
<groupId>cn.hutool</groupId>

‎core/src/main/java/com/robin/core/base/aspect/PrintVersionAspect.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@
44
import com.robin.core.version.VersionInfo;
55
import lombok.extern.slf4j.Slf4j;
66
import org.aspectj.lang.ProceedingJoinPoint;
7-
import org.springframework.core.annotation.Order;
8-
import org.aspectj.lang.annotation.Around;
97
import org.aspectj.lang.annotation.Aspect;
10-
import org.springframework.stereotype.Service;
8+
import org.springframework.core.annotation.Order;
9+
1110

12-
@Service
1311
@Order(1)
1412
@Aspect
1513
@Slf4j
1614
public class PrintVersionAspect {
17-
@Around("@annotation(printVersion)")
18-
public Object printVersionProcess(ProceedingJoinPoint proceedingJoinPoint, PrintVersion printVersion) throws Throwable{
15+
//@Around("@annotation(printVersion)")
16+
public Object printVersionProcess(ProceedingJoinPoint proceedingJoinPoint, PrintVersion printVersion) throws Throwable {
1917
log.debug(VersionInfo.getInstance().getVersion());
2018
return proceedingJoinPoint.proceed();
2119
}

0 commit comments

Comments
 (0)