2.1-RELEASE

febs-apm/febs-admin/Dockerfile

@@ -1,7 +1,7 @@
 FROM openjdk:8u212-jre
 MAINTAINER MrBird 852252810@qq.com
 
-COPY ./target/febs-server-generator-2.0-RELEASE.jar /febs/febs-server-generator-2.0-RELEASE.jar
+COPY ./target/febs-server-generator-2.1-RELEASE.jar /febs/febs-server-generator-2.1-RELEASE.jar
 ADD agent/ /agent
 
-ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-server-generator", "-Dskywalking.collector.backend_service=skywalkingIp:11800", "-jar", "/febs/febs-server-generator-2.0-RELEASE.jar"]
+ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-server-generator", "-Dskywalking.collector.backend_service=skywalkingIp:11800", "-jar", "/febs/febs-server-generator-2.1-RELEASE.jar"]

febs-apm/febs-admin/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <groupId>cc.mrbird</groupId>
         <artifactId>febs-apm</artifactId>
-        <version>2.0-RELEASE</version>
+        <version>2.1-RELEASE</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>febs-admin</artifactId>
-    <version>2.0-RELEASE</version>
+    <version>2.1-RELEASE</version>
     <name>FEBS-Admin</name>
     <description>Febs-Admin基于Spring Boot Admin搭建的监控程序</description>
 

febs-apm/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>febs-cloud</artifactId>
         <groupId>cc.mrbird</groupId>
-        <version>2.0-RELEASE</version>
+        <version>2.1-RELEASE</version>
         <relativePath>../febs-cloud/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>febs-apm</artifactId>
-    <version>2.0-RELEASE</version>
+    <version>2.1-RELEASE</version>
     <packaging>pom</packaging>
     <name>FEBS-APM</name>
     <description>FEBS-APM(Application Performance Monitor)</description>

febs-auth/Dockerfile

@@ -1,7 +1,7 @@
 FROM openjdk:8u212-jre
 MAINTAINER MrBird 852252810@qq.com
 
-COPY ./target/febs-auth-2.0-RELEASE.jar /febs/febs-auth-2.0-RELEASE.jar
+COPY ./target/febs-auth-2.1-RELEASE.jar /febs/febs-auth-2.1-RELEASE.jar
 ADD agent/ /agent
 
-ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-auth", "-Dskywalking.collector.backend_service=skywalkingIp:11800", "-jar", "/febs/febs-auth-2.0-RELEASE.jar"]
+ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-auth", "-Dskywalking.collector.backend_service=skywalkingIp:11800", "-jar", "/febs/febs-auth-2.1-RELEASE.jar"]

febs-auth/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>cc.mrbird</groupId>
         <artifactId>febs-cloud</artifactId>
-        <version>2.0-RELEASE</version>
+        <version>2.1-RELEASE</version>
         <relativePath>../febs-cloud/pom.xml</relativePath>
     </parent>
 
@@ -14,7 +14,7 @@
     <description>FEBS-Cloud认证服务器</description>
 
     <properties>
-        <febs-cloud.version>2.0-RELEASE</febs-cloud.version>
+        <febs-cloud.version>2.1-RELEASE</febs-cloud.version>
     </properties>
 
     <dependencies>

febs-cloud/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>cc.mrbird</groupId>
     <artifactId>febs-cloud</artifactId>
-    <version>2.0-RELEASE</version>
+    <version>2.1-RELEASE</version>
     <packaging>pom</packaging>
 
     <name>FEBS-Cloud</name>

febs-cloud/postman/FEBS-Cloud.postman_collection.json

@@ -6,7 +6,7 @@
   },
   "item": [
     {
-      "name": "1. 获取令牌",
+      "name": "1. 密码模式获取令牌",
       "request": {
         "auth": {
           "type": "noauth"
@@ -21,7 +21,7 @@
           }
         ],
         "url": {
-          "raw": "http://localhost:8301/auth/oauth/token?grant_type=password&username=mrbird&password=1234qwer&key=1234&code=9976",
+          "raw": "http://localhost:8301/auth/oauth/token?grant_type=password&username=mrbird&password=1234qwer&key=1234&code=8873",
           "protocol": "http",
           "host": [
             "localhost"
@@ -55,7 +55,7 @@
             },
             {
               "key": "code",
-              "value": "9976",
+              "value": "8873",
               "description": "验证码值（验证码的值可以通过浏览器访问http://localhost:8301/auth/captcha?key=1234获取）"
             }
           ]
@@ -107,7 +107,7 @@
         "header": [
           {
             "key": "Authorization",
-            "value": "bearer 41171c4d-5b22-41d3-bb41-cb08564b2373",
+            "value": "bearer 4597893b-4ab3-468d-baa2-6ae0faf8ae9e",
             "equals": true,
             "description": "值格式：bearer空格+访问令牌"
           }
@@ -136,7 +136,7 @@
             "description": "值格式：bearer空格+访问令牌",
             "equals": true,
             "key": "Authorization",
-            "value": "bearer 41171c4d-5b22-41d3-bb41-cb08564b2373"
+            "value": "bearer 684d687c-5d10-48fd-a58d-8484896cf9f6"
           }
         ],
         "url": {
@@ -190,6 +190,97 @@
         }
       },
       "response": []
+    },
+    {
+      "name": "6. 授权码模式获取令牌",
+      "request": {
+        "auth": {
+          "type": "noauth"
+        },
+        "method": "POST",
+        "header": [
+          {
+            "description": "客户端凭证，值的格式为Basic空格 + client_id:client_secret经过Base64加密后的值",
+            "key": "Authorization",
+            "type": "text",
+            "value": "Basic Y29kZToxMjM0NTY="
+          }
+        ],
+        "url": {
+          "raw": "http://localhost:8301/auth/oauth/token?grant_type=authorization_code&code=HLapQA&redirect_uri=http://www.baidu.com",
+          "protocol": "http",
+          "host": [
+            "localhost"
+          ],
+          "port": "8301",
+          "path": [
+            "auth",
+            "oauth",
+            "token"
+          ],
+          "query": [
+            {
+              "key": "grant_type",
+              "value": "authorization_code",
+              "description": "认证类型，authorization_code授权码模式"
+            },
+            {
+              "key": "code",
+              "value": "HLapQA",
+              "description": "授权码"
+            },
+            {
+              "key": "redirect_uri",
+              "value": "http://www.baidu.com",
+              "description": "重定向地址"
+            }
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "7. 客户端模式获取令牌",
+      "request": {
+        "auth": {
+          "type": "noauth"
+        },
+        "method": "POST",
+        "header": [
+          {
+            "description": "客户端凭证，值的格式为Basic空格 + client_id:client_secret经过Base64加密后的值",
+            "key": "Authorization",
+            "type": "text",
+            "value": "Basic Y29kZToxMjM0NTY="
+          }
+        ],
+        "url": {
+          "raw": "http://localhost:8301/auth/oauth/token?grant_type=client_credentials&client=code",
+          "protocol": "http",
+          "host": [
+            "localhost"
+          ],
+          "port": "8301",
+          "path": [
+            "auth",
+            "oauth",
+            "token"
+          ],
+          "query": [
+            {
+              "key": "grant_type",
+              "value": "client_credentials",
+              "description": "认证类型，client_credentials客户端模式"
+            },
+            {
+              "key": "client",
+              "value": "code",
+              "description": "客户端client_id"
+            }
+          ]
+        }
+      },
+      "response": []
     }
   ],
   "protocolProfileBehavior": {}

febs-cloud/sql/febs_cloud_base.sql

@@ -49,7 +49,7 @@ VALUES ('app', '', '$2a$10$8Qk/efslEpO1Af1kyw/rp.DdJGsdnET8UCp1vGDzpQEa.1qBklvua
         NULL, 86400, 864000, NULL, NULL, '123456');
 INSERT INTO `oauth_client_details`
 VALUES ('febs', ' ', '$2a$10$aSZTvMOtUAYUQ.75z2n3ceJd6dCIk9Vy3J/SKZUE4hBLd6sz7.6ge', 'all', 'password,refresh_token',
-        NULL, NULL, 86400, 8640000, NULL, 1, '123456');
+        NULL, NULL, 86400, 8640000, NULL, 0, '123456');
 COMMIT;
 
 -- ----------------------------

febs-common/febs-common-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>febs-common</artifactId>
         <groupId>cc.mrbird</groupId>
-        <version>2.0-RELEASE</version>
+        <version>2.1-RELEASE</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

febs-common/febs-common-datasource-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>febs-common</artifactId>
         <groupId>cc.mrbird</groupId>
-        <version>2.0-RELEASE</version>
+        <version>2.1-RELEASE</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -16,7 +16,7 @@
     <artifactId>febs-common-datasource-starter</artifactId>
 
     <properties>
-        <febs-cloud.version>2.0-RELEASE</febs-cloud.version>
+        <febs-cloud.version>2.1-RELEASE</febs-cloud.version>
     </properties>
 
     <dependencies>

febs-common/febs-common-doc-gateway-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>febs-common</artifactId>
         <groupId>cc.mrbird</groupId>
-        <version>2.0-RELEASE</version>
+        <version>2.1-RELEASE</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -14,7 +14,7 @@
     <description>FEBS-Common-Doc-Gateway-Starter文档网关聚合模块</description>
 
     <properties>
-        <febs-cloud.version>2.0-RELEASE</febs-cloud.version>
+        <febs-cloud.version>2.1-RELEASE</febs-cloud.version>
     </properties>
 
     <dependencies>

febs-common/febs-common-doc-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>febs-common</artifactId>
         <groupId>cc.mrbird</groupId>
-        <version>2.0-RELEASE</version>
+        <version>2.1-RELEASE</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -15,7 +15,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <febs-cloud.version>2.0-RELEASE</febs-cloud.version>
+        <febs-cloud.version>2.1-RELEASE</febs-cloud.version>
     </properties>
 
     <dependencies>

febs-common/febs-common-doc/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>febs-common</artifactId>
         <groupId>cc.mrbird</groupId>
-        <version>2.0-RELEASE</version>
+        <version>2.1-RELEASE</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

febs-common/febs-common-redis-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>febs-common</artifactId>
         <groupId>cc.mrbird</groupId>
-        <version>2.0-RELEASE</version>
+        <version>2.1-RELEASE</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

febs-common/febs-common-security-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>febs-common</artifactId>
         <groupId>cc.mrbird</groupId>
-        <version>2.0-RELEASE</version>
+        <version>2.1-RELEASE</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -14,7 +14,7 @@
     <description>FEBS-Common-Security-Starter安全模块</description>
 
     <properties>
-        <febs-cloud.version>2.0-RELEASE</febs-cloud.version>
+        <febs-cloud.version>2.1-RELEASE</febs-cloud.version>
     </properties>
 
     <dependencies>

febs-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>cc.mrbird</groupId>
         <artifactId>febs-cloud</artifactId>
-        <version>2.0-RELEASE</version>
+        <version>2.1-RELEASE</version>
         <relativePath>../febs-cloud/pom.xml</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
     </modules>
 
     <artifactId>febs-common</artifactId>
-    <version>2.0-RELEASE</version>
+    <version>2.1-RELEASE</version>
     <name>FEBS-Common</name>
     <packaging>pom</packaging>
     <description>FEBS-Common通用模块</description>

febs-gateway/Dockerfile

@@ -1,7 +1,7 @@
 FROM openjdk:8u212-jre
 MAINTAINER MrBird 852252810@qq.com
 
-COPY ./target/febs-gateway-2.0-RELEASE.jar /febs/febs-gateway-2.0-RELEASE.jar
+COPY ./target/febs-gateway-2.1-RELEASE.jar /febs/febs-gateway-2.1-RELEASE.jar
 ADD agent/ /agent
 
-ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-gateway", "-Dskywalking.collector.backend_service=skywalkingIp:11800", "-jar", "/febs/febs-gateway-2.0-RELEASE.jar"]
+ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-gateway", "-Dskywalking.collector.backend_service=skywalkingIp:11800", "-jar", "/febs/febs-gateway-2.1-RELEASE.jar"]

febs-gateway/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>cc.mrbird</groupId>
         <artifactId>febs-cloud</artifactId>
-        <version>2.0-RELEASE</version>
+        <version>2.1-RELEASE</version>
         <relativePath>../febs-cloud/pom.xml</relativePath>
     </parent>
 
@@ -14,7 +14,7 @@
     <description>FEBS-Gateway服务网关模块</description>
 
     <properties>
-        <febs-cloud.version>2.0-RELEASE</febs-cloud.version>
+        <febs-cloud.version>2.1-RELEASE</febs-cloud.version>
     </properties>
 
     <dependencies>

febs-server/febs-server-generator/Dockerfile

@@ -1,7 +1,7 @@
 FROM openjdk:8u212-jre
 MAINTAINER MrBird 852252810@qq.com
 
-COPY ./target/febs-server-generator-2.0-RELEASE.jar /febs/febs-server-generator-2.0-RELEASE.jar
+COPY ./target/febs-server-generator-2.1-RELEASE.jar /febs/febs-server-generator-2.1-RELEASE.jar
 ADD agent/ /agent
 
-ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-generator", "-Dskywalking.collector.backend_service=skywalkingIp:11800", "-jar", "/febs/febs-server-generator-2.0-RELEASE.jar"]
+ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-generator", "-Dskywalking.collector.backend_service=skywalkingIp:11800", "-jar", "/febs/febs-server-generator-2.1-RELEASE.jar"]

febs-server/febs-server-generator/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>cc.mrbird</groupId>
         <artifactId>febs-server</artifactId>
-        <version>2.0-RELEASE</version>
+        <version>2.1-RELEASE</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -14,7 +14,7 @@
     <description>FEBS-Server-Generator代码生成器</description>
 
     <properties>
-        <febs-cloud.version>2.0-RELEASE</febs-cloud.version>
+        <febs-cloud.version>2.1-RELEASE</febs-cloud.version>
     </properties>
 
     <dependencies>

febs-server/febs-server-job/Dockerfile

@@ -1,7 +1,7 @@
 FROM openjdk:8u212-jre
 MAINTAINER MrBird 852252810@qq.com
 
-COPY ./target/febs-server-job-2.0-RELEASE.jar /febs/febs-server-job-2.0-RELEASE.jar
+COPY ./target/febs-server-job-2.1-RELEASE.jar /febs/febs-server-job-2.1-RELEASE.jar
 ADD agent/ /agent
 
-ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-server-job", "-Dskywalking.collector.backend_service=skywalkingIp:11800", "-jar", "/febs/febs-server-job-2.0-RELEASE.jar"]
+ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-server-job", "-Dskywalking.collector.backend_service=skywalkingIp:11800", "-jar", "/febs/febs-server-job-2.1-RELEASE.jar"]

febs-server/febs-server-job/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cc.mrbird</groupId>
         <artifactId>febs-server</artifactId>
-        <version>2.0-RELEASE</version>
+        <version>2.1-RELEASE</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -15,7 +15,7 @@
     <description>FEBS-Server-Job任务调度服务</description>
 
     <properties>
-        <febs-cloud.version>2.0-RELEASE</febs-cloud.version>
+        <febs-cloud.version>2.1-RELEASE</febs-cloud.version>
     </properties>
 
     <dependencies>

febs-server/febs-server-system/Dockerfile

@@ -1,7 +1,7 @@
 FROM openjdk:8u212-jre
 MAINTAINER MrBird 852252810@qq.com
 
-COPY ./target/febs-server-system-2.0-RELEASE.jar /febs/febs-server-system-2.0-RELEASE.jar
+COPY ./target/febs-server-system-2.1-RELEASE.jar /febs/febs-server-system-2.1-RELEASE.jar
 ADD agent/ /agent
 
-ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-server-system", "-Dskywalking.collector.backend_service=skywalkingIp:11800", "-jar", "/febs/febs-server-system-2.0-RELEASE.jar"]
+ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-server-system", "-Dskywalking.collector.backend_service=skywalkingIp:11800", "-jar", "/febs/febs-server-system-2.1-RELEASE.jar"]

febs-server/febs-server-system/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cc.mrbird</groupId>
         <artifactId>febs-server</artifactId>
-        <version>2.0-RELEASE</version>
+        <version>2.1-RELEASE</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -15,7 +15,7 @@
     <description>FEBS-Server-System微服务系统模块</description>
 
     <properties>
-        <febs-cloud.version>2.0-RELEASE</febs-cloud.version>
+        <febs-cloud.version>2.1-RELEASE</febs-cloud.version>
     </properties>
 
     <dependencies>

febs-server/febs-server-test/Dockerfile

@@ -1,7 +1,7 @@
 FROM openjdk:8u212-jre
 MAINTAINER MrBird 852252810@qq.com
 
-COPY ./target/febs-server-test-2.0-RELEASE.jar /febs/febs-server-test-2.0-RELEASE.jar
+COPY ./target/febs-server-test-2.1-RELEASE.jar /febs/febs-server-test-2.1-RELEASE.jar
 ADD agent/ /agent
 
-ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-server-test", "-Dskywalking.collector.backend_service=skywalkingIp:11800", "-jar", "/febs/febs-server-test-2.0-RELEASE.jar"]
+ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-server-test", "-Dskywalking.collector.backend_service=skywalkingIp:11800", "-jar", "/febs/febs-server-test-2.1-RELEASE.jar"]

febs-server/febs-server-test/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cc.mrbird</groupId>
         <artifactId>febs-server</artifactId>
-        <version>2.0-RELEASE</version>
+        <version>2.1-RELEASE</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -15,7 +15,7 @@
     <description>FEBS-Server-Test Demo服务模块</description>
 
     <properties>
-        <febs-cloud.version>2.0-RELEASE</febs-cloud.version>
+        <febs-cloud.version>2.1-RELEASE</febs-cloud.version>
     </properties>
 
     <dependencies>

febs-server/pom.xml

@@ -7,12 +7,12 @@
     <parent>
         <groupId>cc.mrbird</groupId>
         <artifactId>febs-cloud</artifactId>
-        <version>2.0-RELEASE</version>
+        <version>2.1-RELEASE</version>
         <relativePath>../febs-cloud/pom.xml</relativePath>
     </parent>
 
     <artifactId>febs-server</artifactId>
-    <version>2.0-RELEASE</version>
+    <version>2.1-RELEASE</version>
     <packaging>pom</packaging>
     <name>FEBS-Server</name>
     <description>FEBS-Server服务提供模块</description>

febs-tx-manager/Dockerfile

@@ -1,7 +1,7 @@
 FROM openjdk:8u212-jre
 MAINTAINER MrBird 852252810@qq.com
 
-COPY ./target/febs-tx-manager-2.0-RELEASE.jar /febs/febs-tx-manager-2.0-RELEASE.jar
+COPY ./target/febs-tx-manager-2.1-RELEASE.jar /febs/febs-tx-manager-2.1-RELEASE.jar
 ADD agent/ /agent
 
-ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-tx-manager", "-Dskywalking.collector.backend_service=skywalkingIp:11800", "-jar", "/febs/febs-tx-manager-2.0-RELEASE.jar"]
+ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-tx-manager", "-Dskywalking.collector.backend_service=skywalkingIp:11800", "-jar", "/febs/febs-tx-manager-2.1-RELEASE.jar"]

febs-tx-manager/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>cc.mrbird</groupId>
         <artifactId>febs-cloud</artifactId>
-        <version>2.0-RELEASE</version>
+        <version>2.1-RELEASE</version>
         <relativePath>../febs-cloud/pom.xml</relativePath>
     </parent>