Compare commits

..

No commits in common. 'master' and 'develop' have entirely different histories.

  1. 6
      README.md
  2. 4
      doc/docs/README.md
  3. 14
      sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/service/impl/EurekaUri.java
  4. 10
      sop-common/sop-bridge-nacos/pom.xml
  5. 12
      sop-common/sop-service-common/pom.xml
  6. 2
      sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/client/OpenClient.java
  7. 2
      sop-website/sop-website-vue/src/components/DocView/index.vue

@ -142,3 +142,9 @@ System.out.println(responseData);
## 相关文档
[开发文档](http://durcframework.gitee.io/sop)
## 沟通交流
- QQ群
1群:167643071(满)、2群:167643071(满)、3群:565894770

@ -1,3 +1,7 @@
# SOP开发文档
Git地址:[SOP](https://gitee.com/durcframework/SOP)
- QQ群
1群:167643071(满)、2群:167643071(满)、3群:565894770

@ -5,8 +5,6 @@ import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.internal.http.HttpMethod;
import java.util.Base64;
/**
* https://github.com/Netflix/eureka/wiki/Eureka-REST-operations
*
@ -66,16 +64,12 @@ public enum EurekaUri {
url = url.substring(0, url.length() - 1);
}
String requestUrl = url + getUri(args);
Request.Builder builder = this.getBuilder()
Request request = this.getBuilder()
.url(requestUrl)
.addHeader("Content-Type", "application/json")
.addHeader("Accept", "application/json");
//是否开启 Basic
if(url.contains("@") && url.contains(":")){
String user = url.split("@")[0].replace("http://","").replace("https://","");
builder.addHeader("Authorization","Basic " + Base64.getUrlEncoder().encodeToString(user.getBytes()));
}
return builder.build();
.addHeader("Accept", "application/json")
.build();
return request;
}
public Request.Builder getBuilder() {

@ -2,16 +2,20 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.gitee.sop</groupId>
<artifactId>sop-common</artifactId>
<version>4.4.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.gitee.sop</groupId>
<artifactId>sop-bridge-nacos</artifactId>
<version>4.4.2-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>com.gitee.sop</groupId>
<artifactId>sop-gateway-common</artifactId>
<version>4.4.2-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>

@ -39,7 +39,6 @@
<springfox-swagger2.version>2.9.2</springfox-swagger2.version>
<easyopen.version>1.16.9</easyopen.version>
<pagehelper.version>5.2.0</pagehelper.version>
<asm.version>6.2</asm.version>
</properties>
<dependencies>
@ -74,11 +73,6 @@
<artifactId>hibernate-validator</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<!-- optional -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
@ -219,12 +213,6 @@
<version>${hibernate-validator.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>

@ -157,7 +157,7 @@ public class OpenClient {
form.put(this.openConfig.getAppKeyName(), this.appId);
String content = SopSignature.getSignContent(form);
String sign;
String sign = null;
try {
sign = SopSignature.rsaSign(content, privateKey, openConfig.getCharset(), openConfig.getSignType());
} catch (SopSignException e) {

@ -17,7 +17,7 @@
<el-table-column prop="versionValue" width="120" />
</el-table>
<h3>接口描述</h3>
<div class="doc-overview" v-html="docInfo.description || docInfo.title"></div>
<div class="doc-overview">{{ docInfo.description || docInfo.title }}</div>
<h3>请求地址</h3>
<el-table
:data="[{ envLabel: '环境', envValue: '正式环境', urlLabel: '请求地址', urlValue: urlProd }]"

Loading…
Cancel
Save