diff --git a/LICENSE b/LICENSE
index c413276..8e376c8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -53,7 +53,7 @@
3, 请将如下声明文本放入每个源文件的头部注释中。
- Copyright (c) 2019-2020 feihu.wang
+ Copyright (c) 2019 WangFeiHu
Radar is licensed under Mulan PSL v2.
You can use this software according to the terms and conditions of the Mulan PSL v2.
You may obtain a copy of Mulan PSL v2 at:
@@ -118,7 +118,7 @@
iii Attach the statement to the appropriate annotated syntax at the beginning of each source file.
- Copyright (c) 2019-2020 feihu.wang
+ Copyright (c) 2019 WangFeiHu
Radar is licensed under Mulan PSL v2.
You can use this software according to the terms and conditions of the Mulan PSL v2.
You may obtain a copy of Mulan PSL v2 at:
diff --git a/README.md b/README.md
index 833ba09..77fdc94 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ The project code called Radar, like the code, monitor the transaction at the bac
## 相关站点
Gitee: https://gitee.com/freshday/radar // 码云为镜像网站,贡献代码请提交到 github
Github: https://github.com/wfh45678/radar
- 官网: https://www.pgmmer.top
+ 官网: https://www.91risk.com
Wiki: https://gitee.com/freshday/radar/wikis/home
@@ -48,7 +48,7 @@ The project code called Radar, like the code, monitor the transaction at the bac
前端技术框架: React(SPA)
### 架构图
-![系统模块](https://www.pgmmer.top/radar/sys_model_arch.png)
+![系统模块](https://www.91risk.com/radar/sys_model_arch.png)
## 技术选型
* Springboot:笔者是java 出生, 选择 Springboot 理所当然,方便自己, 也方便其他Java使用者进行扩展。
@@ -79,7 +79,7 @@ https://gitee.com/freshday/radar/wikis/manual
## 演示入口
通过管理端能够快速了解系统是怎么从风险的定义到风险的量化再到风险的集中管理的整个工作流程。
为了更好的体验,请花一分钟观看 [使用手册](https://gitee.com/freshday/radar/wikis/manual?sort_id=1637446)
-[Demo URL:](https://www.pgmmer.top) https://www.pgmmer.top
+[Demo URL:](https://www.91risk.com) https://www.91risk.com
建议大家自行注册用户,避免使用同样的测试账号受干扰.
## 相关文档
@@ -107,4 +107,4 @@ https://gitee.com/freshday/radar/wikis/manual
## 特别说明
前端源码仅对企业级用户开放,需付费购买。
未经授权,禁止使用本项目源码申请软著和专利,保留追究法律责任的权力!
- Copyright © 2019-2020 WangFeiHu
+ Copyright © 2019-2021 WangFeiHu
diff --git a/pom.xml b/pom.xml
index 635957c..da2c504 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
com.pgmmers
radar
- 1.0.6-SNAPSHOT
+ 1.0.7-SNAPSHOT
radar
Demo project for Spring Boot
pom
diff --git a/radar-admin/pom.xml b/radar-admin/pom.xml
index e1f9df0..87b64cd 100644
--- a/radar-admin/pom.xml
+++ b/radar-admin/pom.xml
@@ -5,7 +5,7 @@
radar
com.pgmmers
- 1.0.6-SNAPSHOT
+ 1.0.7-SNAPSHOT
4.0.0
radar-admin
diff --git a/radar-admin/src/main/java/com/pgmmers/AdminApplication.java b/radar-admin/src/main/java/com/pgmmers/AdminApplication.java
index 8f4977f..6966930 100644
--- a/radar-admin/src/main/java/com/pgmmers/AdminApplication.java
+++ b/radar-admin/src/main/java/com/pgmmers/AdminApplication.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 WangFeiHu
+ * Radar is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+*/
+
package com.pgmmers;
import org.springframework.boot.SpringApplication;
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/config/EsConfig.java b/radar-admin/src/main/java/com/pgmmers/radar/config/EsConfig.java
index 1ec4457..13dde7b 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/config/EsConfig.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/config/EsConfig.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 WangFeiHu
+ * Radar is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
package com.pgmmers.radar.config;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpHost;
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/config/RedisCacheAutoConfig.java b/radar-admin/src/main/java/com/pgmmers/radar/config/RedisCacheAutoConfig.java
index 3feef59..a93c825 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/config/RedisCacheAutoConfig.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/config/RedisCacheAutoConfig.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 WangFeiHu
+ * Radar is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
package com.pgmmers.radar.config;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/config/RedisConfig.java b/radar-admin/src/main/java/com/pgmmers/radar/config/RedisConfig.java
index 61a6f79..23876c9 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/config/RedisConfig.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/config/RedisConfig.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 WangFeiHu
+ * Radar is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
package com.pgmmers.radar.config;
import org.springframework.cache.CacheManager;
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/config/RestTemplateConfig.java b/radar-admin/src/main/java/com/pgmmers/radar/config/RestTemplateConfig.java
index a1ad667..04095f9 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/config/RestTemplateConfig.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/config/RestTemplateConfig.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 WangFeiHu
+ * Radar is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
package com.pgmmers.radar.config;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/config/SwaggerConfig.java b/radar-admin/src/main/java/com/pgmmers/radar/config/SwaggerConfig.java
index 559d12e..8964bb3 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/config/SwaggerConfig.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/config/SwaggerConfig.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 WangFeiHu
+ * Radar is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
package com.pgmmers.radar.config;
import org.springframework.context.annotation.Bean;
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/config/TokenServerConfig.java b/radar-admin/src/main/java/com/pgmmers/radar/config/TokenServerConfig.java
index 268ea44..62cea5b 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/config/TokenServerConfig.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/config/TokenServerConfig.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 WangFeiHu
+ * Radar is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
package com.pgmmers.radar.config;
import com.pgmmers.radar.intercpt.JsonWebTokenService;
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/controller/AbstractionApiController.java b/radar-admin/src/main/java/com/pgmmers/radar/controller/AbstractionApiController.java
index a4c9ccc..e26a912 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/controller/AbstractionApiController.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/controller/AbstractionApiController.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 WangFeiHu
+ * Radar is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
package com.pgmmers.radar.controller;
import com.alibaba.fastjson.JSONArray;
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/controller/ActivationApiController.java b/radar-admin/src/main/java/com/pgmmers/radar/controller/ActivationApiController.java
index 0ef867f..786ee07 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/controller/ActivationApiController.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/controller/ActivationApiController.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 WangFeiHu
+ * Radar is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
package com.pgmmers.radar.controller;
import com.alibaba.fastjson.JSONArray;
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/controller/CommonApiController.java b/radar-admin/src/main/java/com/pgmmers/radar/controller/CommonApiController.java
index 8fcd38c..5e28dd6 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/controller/CommonApiController.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/controller/CommonApiController.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 WangFeiHu
+ * Radar is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
package com.pgmmers.radar.controller;
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/controller/DataListApiController.java b/radar-admin/src/main/java/com/pgmmers/radar/controller/DataListApiController.java
index f6dfa1c..5a9f9bc 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/controller/DataListApiController.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/controller/DataListApiController.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 WangFeiHu
+ * Radar is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
package com.pgmmers.radar.controller;
import com.pgmmers.radar.dal.bean.DataListQuery;
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/controller/DataListMetaApiController.java b/radar-admin/src/main/java/com/pgmmers/radar/controller/DataListMetaApiController.java
index 1c83295..90ac512 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/controller/DataListMetaApiController.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/controller/DataListMetaApiController.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 WangFeiHu
+ * Radar is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
package com.pgmmers.radar.controller;
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/controller/DataListRecordApiController.java b/radar-admin/src/main/java/com/pgmmers/radar/controller/DataListRecordApiController.java
index 37e866c..3e96d9e 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/controller/DataListRecordApiController.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/controller/DataListRecordApiController.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 WangFeiHu
+ * Radar is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
package com.pgmmers.radar.controller;
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/controller/EventApiController.java b/radar-admin/src/main/java/com/pgmmers/radar/controller/EventApiController.java
index 70efeca..191eab2 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/controller/EventApiController.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/controller/EventApiController.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 WangFeiHu
+ * Radar is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
package com.pgmmers.radar.controller;
import com.alibaba.fastjson.JSONArray;
@@ -45,7 +55,6 @@
* 以后会独立拆分到分析子项目里面去。
* @author feihu.wang
*/
-@Deprecated
@RestController
@RequestMapping("/services/v1/event")
@Api(value = "EventApi", description = "事件信息检索接口相关操作", tags = {"事件信息检索分析API"}, hidden = true)
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/controller/FieldApiController.java b/radar-admin/src/main/java/com/pgmmers/radar/controller/FieldApiController.java
index 36d7c1d..7d697de 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/controller/FieldApiController.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/controller/FieldApiController.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 WangFeiHu
+ * Radar is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
package com.pgmmers.radar.controller;
import com.pgmmers.radar.dal.bean.FieldQuery;
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/controller/ModelApiController.java b/radar-admin/src/main/java/com/pgmmers/radar/controller/ModelApiController.java
index c7f8d22..0527046 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/controller/ModelApiController.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/controller/ModelApiController.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 WangFeiHu
+ * Radar is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
package com.pgmmers.radar.controller;
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/controller/ModelConfigApiController.java b/radar-admin/src/main/java/com/pgmmers/radar/controller/ModelConfigApiController.java
index 9aded93..9393209 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/controller/ModelConfigApiController.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/controller/ModelConfigApiController.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 WangFeiHu
+ * Radar is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
package com.pgmmers.radar.controller;
import com.pgmmers.radar.service.common.CommonResult;
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/controller/ModelConfigParamApiController.java b/radar-admin/src/main/java/com/pgmmers/radar/controller/ModelConfigParamApiController.java
index 184888a..121193b 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/controller/ModelConfigParamApiController.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/controller/ModelConfigParamApiController.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 WangFeiHu
+ * Radar is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
package com.pgmmers.radar.controller;
import com.pgmmers.radar.service.common.CommonResult;
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/controller/PreItemApiController.java b/radar-admin/src/main/java/com/pgmmers/radar/controller/PreItemApiController.java
index 5498601..aa39dd3 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/controller/PreItemApiController.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/controller/PreItemApiController.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 WangFeiHu
+ * Radar is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
package com.pgmmers.radar.controller;
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/controller/RuleApiController.java b/radar-admin/src/main/java/com/pgmmers/radar/controller/RuleApiController.java
index 91c8692..129f566 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/controller/RuleApiController.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/controller/RuleApiController.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 WangFeiHu
+ * Radar is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
package com.pgmmers.radar.controller;
import com.pgmmers.radar.dal.bean.EventQuery;
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/controller/SysLoginApiController.java b/radar-admin/src/main/java/com/pgmmers/radar/controller/UserApiController.java
similarity index 89%
rename from radar-admin/src/main/java/com/pgmmers/radar/controller/SysLoginApiController.java
rename to radar-admin/src/main/java/com/pgmmers/radar/controller/UserApiController.java
index 47e47e4..5e1c758 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/controller/SysLoginApiController.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/controller/UserApiController.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 WangFeiHu
+ * Radar is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
package com.pgmmers.radar.controller;
@@ -29,9 +39,9 @@
@RestController
@RequestMapping("/services/v1")
@Api(value = "SysLoginAPI", description = "用户登录相关操作接口", tags = {"用户登录相关API"})
-public class SysLoginApiController {
+public class UserApiController {
- private static final Logger logger = LoggerFactory.getLogger(SysLoginApiController.class);
+ private static final Logger logger = LoggerFactory.getLogger(UserApiController.class);
@Autowired
private UserService userService;
@@ -45,7 +55,7 @@ public class SysLoginApiController {
@Autowired
private CacheService cacheService;
- @PostMapping("/merchant/login")
+ @PostMapping("/user/login")
public CommonResult login(String loginName, String passwd, String captcha) {
CommonResult ret = new CommonResult();
ret.setSuccess(false);
@@ -84,7 +94,7 @@ public CommonResult login(String loginName, String passwd, String captcha) {
return ret;
}
- @GetMapping("/merchant/logout")
+ @GetMapping("/user/logout")
public CommonResult logout(HttpServletRequest request) {
CommonResult ret = new CommonResult();
String accessToken = contextHolder.getAttributeByType("x-auth-token", String.class);
@@ -99,7 +109,7 @@ public CommonResult logout(HttpServletRequest request) {
* @return
* @author xushuai
*/
- @PostMapping("/merchant/regist")
+ @PostMapping("/user/regist")
public CommonResult regist(String loginName, String passwd, String verifyPasswd, String captcha, String giteeAccount) {
CommonResult result = new CommonResult();
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/intercpt/AuthInterceptor.java b/radar-admin/src/main/java/com/pgmmers/radar/intercpt/AuthInterceptor.java
index 5fa3f91..915b9df 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/intercpt/AuthInterceptor.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/intercpt/AuthInterceptor.java
@@ -41,7 +41,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
logger.info("uri:{}", uri);
CommonResult result = new CommonResult();
Map additionalProperties = Maps.newHashMap();
- if (uri.startsWith("/services") && !uri.contains("/merchant/login") && !uri.contains("/merchant/regist") && !uri.contains("/common")) {
+ if (uri.startsWith("/services") && !uri.contains("/user/login") && !uri.contains("/user/regist") && !uri.contains("/common")) {
Context context = new Context();
String accessToken = request.getHeader("x-auth-token");
if(StringUtils.isEmpty(accessToken)) {
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/intercpt/JsonWebTokenService.java b/radar-admin/src/main/java/com/pgmmers/radar/intercpt/JsonWebTokenService.java
index a53c202..4e0b0ed 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/intercpt/JsonWebTokenService.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/intercpt/JsonWebTokenService.java
@@ -1,6 +1,5 @@
package com.pgmmers.radar.intercpt;
-import com.pgmmers.radar.controller.SysLoginApiController;
import com.pgmmers.radar.service.cache.RedisService;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.ExpiredJwtException;
@@ -29,7 +28,7 @@ public class JsonWebTokenService {
//单位是秒 2 * 3600=10*60*60=10*60分钟=2小时
private Integer accessTokenValidTimeInSeconds = 2 * 3600;
- private static final Logger logger = LoggerFactory.getLogger(SysLoginApiController.class);
+ private static final Logger logger = LoggerFactory.getLogger(JsonWebTokenService.class);
public JsonWebTokenService(String signatureAlgorithm, String secret) {
this.signatureAlgorithm = SignatureAlgorithm.forName(signatureAlgorithm);
diff --git a/radar-admin/src/main/resources/static/index.3bb53ece-1.css b/radar-admin/src/main/resources/static/index.fd241aec-1.css
similarity index 100%
rename from radar-admin/src/main/resources/static/index.3bb53ece-1.css
rename to radar-admin/src/main/resources/static/index.fd241aec-1.css
diff --git a/radar-admin/src/main/resources/static/index.3bb53ece-2.css b/radar-admin/src/main/resources/static/index.fd241aec-2.css
similarity index 100%
rename from radar-admin/src/main/resources/static/index.3bb53ece-2.css
rename to radar-admin/src/main/resources/static/index.fd241aec-2.css
diff --git a/radar-admin/src/main/resources/static/index.3bb53ece-3.css b/radar-admin/src/main/resources/static/index.fd241aec-3.css
similarity index 100%
rename from radar-admin/src/main/resources/static/index.3bb53ece-3.css
rename to radar-admin/src/main/resources/static/index.fd241aec-3.css
diff --git a/radar-admin/src/main/resources/static/index.html b/radar-admin/src/main/resources/static/index.html
index 1c74fb2..5d18a77 100644
--- a/radar-admin/src/main/resources/static/index.html
+++ b/radar-admin/src/main/resources/static/index.html
@@ -1,3 +1,3 @@
风控引擎管理平台
\ No newline at end of file
+