diff --git a/.gitignore b/.gitignore index c456c4a3..d6dc1877 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /nbdist/ /.nb-gradle/ /build/ + diff --git a/README.md b/README.md index 8512f4f7..0f9c87cd 100644 --- a/README.md +++ b/README.md @@ -37,10 +37,11 @@ SOP封装了开放平台大部分功能包括:签名验证、统一异常处 - 支持Spring Cloud Gateway - 关闭签名校验功能 - 整合[easyopen](https://gitee.com/durcframework/easyopen) +- 配置中心 ## 后期规划 -- 配置中心,Spring Cloud Config(Zookeeper) +- Spring Cloud Config(Zookeeper) - Admin管理平台,统一管理微服务配置,管理路由信息,微服务上下线,API文档管理等功能 ## 工程说明 @@ -49,8 +50,7 @@ SOP封装了开放平台大部分功能包括:签名验证、统一异常处 - sop-registry:注册中心,eureka实现 - sop-gateway:网关,统一访问入口,Spring Cloud Zuul实现,可切换成Spring Cloud Gateway -- sop-gateway-common:网关公共模块,封装常用功能,包含签名校验、错误处理等功能 -- sop-service-common:微服务端公共模块,封装配套功能 +- sop-common:公共模块,封装常用功能,包含签名校验、错误处理等功能 - sop-story:微服务示例,story服务,同时作为Provider提供服务 - sop-book:微服务示例,book服务,也是Consumer,调用story提供的服务 - sop-test:接口调用测试用例 diff --git a/pom.xml b/pom.xml index 5af1da5e..f366065a 100644 --- a/pom.xml +++ b/pom.xml @@ -8,6 +8,8 @@ 1.0.0-SNAPSHOT pom + 一个开放平台解决方案项目,基于Spring Cloud实现,目标是能够让用户快速得搭建起自己的开放平台 + sop-common sop-admin diff --git a/sop-admin/readme.md b/sop-admin/readme.md new file mode 100644 index 00000000..bbe96d0d --- /dev/null +++ b/sop-admin/readme.md @@ -0,0 +1,7 @@ +# 后台admin + +主要功能: + +- 配置管理 +- 服务管理 +- 路由管理 diff --git a/sop-admin/sop-admin-front/assets/js/ApiUtil.js b/sop-admin/sop-admin-front/assets/js/ApiUtil.js index bce95141..e1432516 100644 --- a/sop-admin/sop-admin-front/assets/js/ApiUtil.js +++ b/sop-admin/sop-admin-front/assets/js/ApiUtil.js @@ -3,7 +3,7 @@ */ var ApiUtil = (function () { // 接口URL,更改此处即可 - var url = 'http://localhost:8082/api'; + var url = SopConfig.url; var URI_CHAR = '/'; var params = {}; diff --git a/sop-admin/sop-admin-front/assets/js/lib.js b/sop-admin/sop-admin-front/assets/js/lib.js index c16fd746..890005c8 100644 --- a/sop-admin/sop-admin-front/assets/js/lib.js +++ b/sop-admin/sop-admin-front/assets/js/lib.js @@ -10,7 +10,8 @@ var lib = (function () { // 始终需要加载的js var alwaysLoadJs = [ - '../../assets/lib/jquery/3.2.1/jquery.min.js' + '../../config/config.js' + ,'../../assets/lib/jquery/3.2.1/jquery.min.js' ,'../../assets/lib/layui/layui.js' ,'../../assets/lib/easyopen/sdk.js' ,'../../assets/lib/layuiext/Form.js' diff --git a/sop-admin/sop-admin-front/config/config.js b/sop-admin/sop-admin-front/config/config.js new file mode 100644 index 00000000..b61e7492 --- /dev/null +++ b/sop-admin/sop-admin-front/config/config.js @@ -0,0 +1,10 @@ +/** + * 配置 + * @type {{url: string}} + */ +var SopConfig = { + /** + * 后端接口url + */ + url: 'http://localhost:8082/api' +} diff --git a/sop-common/readme.md b/sop-common/readme.md index 1ab02597..2db2642a 100644 --- a/sop-common/readme.md +++ b/sop-common/readme.md @@ -1,5 +1,8 @@ # sop-common +- sop-gateway-common:提供给网关使用 +- sop-service-common:提供给微服务端使用,需要打成jar + - 打包成jar:`mvn clean package` - 上传到本机仓库:`mvn clean install` - 上传到maven私服:`mvn clean deploy` \ No newline at end of file diff --git a/sop-test/readme.md b/sop-test/readme.md index 1dcc85cb..3c50506c 100644 --- a/sop-test/readme.md +++ b/sop-test/readme.md @@ -1,3 +1,3 @@ -# 测试 +# 测试接口调用 -查看测试用例 \ No newline at end of file +查看测试用例 diff --git a/sop-test/src/test/java/com/gitee/sop/AlipayClientPostTest.java b/sop-test/src/test/java/com/gitee/sop/AlipayClientPostTest.java index 39fb7e1f..89794588 100644 --- a/sop-test/src/test/java/com/gitee/sop/AlipayClientPostTest.java +++ b/sop-test/src/test/java/com/gitee/sop/AlipayClientPostTest.java @@ -58,7 +58,6 @@ biz_content String 是 请求参数的集合,最大长度不限,除公共 Map bizContent = new HashMap<>(); bizContent.put("id", "1"); bizContent.put("name", "葫芦娃"); -// bizContent.put("name", "葫芦娃1234567890葫芦娃1234567890"); // 超出长度 params.put("biz_content", JSON.toJSONString(bizContent));