Skip to content

Commit 0bb8589

Browse files
nkorangenkorange
authored
Merge pull request #1245 from yongchao9/hotfix_169
[ISSUE #169] 服务列表中增加示例代码查看功能
2 parents 78a4f0c + 748070c commit 0bb8589

File tree

8 files changed

+702
-166
lines changed

8 files changed

+702
-166
lines changed

‎api/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<groupId>org.apache.maven.plugins</groupId>
3333
<artifactId>maven-compiler-plugin</artifactId>
3434
<configuration>
35-
<source>7</source>
36-
<target>7</target>
35+
<source>6</source>
36+
<target>6</target>
3737
</configuration>
3838
</plugin>
3939
</plugins>

‎console/pom.xml

+134-134
Original file line numberDiff line numberDiff line change
@@ -1,134 +1,134 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
Copyright 1999-2018 Alibaba Group Holding Ltd.
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
http://www.apache.org/licenses/LICENSE-2.0
8-
Unless required by applicable law or agreed to in writing, software
9-
distributed under the License is distributed on an "AS IS" BASIS,
10-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11-
See the License for the specific language governing permissions and
12-
limitations under the License.
13-
-->
14-
<project xmlns="http://maven.apache.org/POM/4.0.0"
15-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
17-
<modelVersion>4.0.0</modelVersion>
18-
<parent>
19-
<groupId>com.alibaba.nacos</groupId>
20-
<artifactId>nacos-all</artifactId>
21-
<version>1.0.1</version>
22-
</parent>
23-
<artifactId>nacos-console</artifactId>
24-
<!--<packaging>war</packaging>-->
25-
<packaging>jar</packaging>
26-
<name>nacos-console ${project.version}</name>
27-
<url>http://maven.apache.org</url>
28-
<properties>
29-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
30-
</properties>
31-
<dependencies>
32-
33-
<dependency>
34-
<groupId>${project.groupId}</groupId>
35-
<artifactId>nacos-config</artifactId>
36-
</dependency>
37-
<dependency>
38-
<groupId>org.apache.tomcat.embed</groupId>
39-
<artifactId>tomcat-embed-jasper</artifactId>
40-
<version>7.0.59</version>
41-
</dependency>
42-
<dependency>
43-
<groupId>${project.groupId}</groupId>
44-
<artifactId>nacos-naming</artifactId>
45-
</dependency>
46-
<!-- log -->
47-
<!-- log4j通过slf4j来代理 -->
48-
<dependency>
49-
<groupId>org.slf4j</groupId>
50-
<artifactId>log4j-over-slf4j</artifactId>
51-
</dependency>
52-
<!-- apache commons logging通过slf4j来代理 -->
53-
<dependency>
54-
<groupId>org.slf4j</groupId>
55-
<artifactId>jcl-over-slf4j</artifactId>
56-
</dependency>
57-
<!-- java.util.logging 通过slf4j来代理 -->
58-
<dependency>
59-
<groupId>org.slf4j</groupId>
60-
<artifactId>jul-to-slf4j</artifactId>
61-
</dependency>
62-
<!-- log -->
63-
<dependency>
64-
<groupId>org.mockito</groupId>
65-
<artifactId>mockito-core</artifactId>
66-
<scope>test</scope>
67-
</dependency>
68-
<dependency>
69-
<groupId>org.springframework.boot</groupId>
70-
<artifactId>spring-boot-starter-security</artifactId>
71-
</dependency>
72-
<dependency>
73-
<groupId>io.jsonwebtoken</groupId>
74-
<artifactId>jjwt-api</artifactId>
75-
</dependency>
76-
<dependency>
77-
<groupId>io.jsonwebtoken</groupId>
78-
<artifactId>jjwt-impl</artifactId>
79-
<scope>runtime</scope>
80-
</dependency>
81-
<dependency>
82-
<groupId>io.jsonwebtoken</groupId>
83-
<artifactId>jjwt-jackson</artifactId>
84-
<scope>runtime</scope>
85-
</dependency>
86-
</dependencies>
87-
<build>
88-
<finalName>nacos-server</finalName>
89-
<plugins>
90-
<plugin>
91-
<artifactId>maven-jar-plugin</artifactId>
92-
<configuration>
93-
<archive>
94-
<manifest>
95-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
96-
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
97-
</manifest>
98-
</archive>
99-
</configuration>
100-
</plugin>
101-
<plugin>
102-
<groupId>org.springframework.boot</groupId>
103-
<artifactId>spring-boot-maven-plugin</artifactId>
104-
<version>2.1.1.RELEASE</version>
105-
<configuration>
106-
<mainClass>com.alibaba.nacos.Nacos</mainClass>
107-
<layout>ZIP</layout>
108-
</configuration>
109-
<executions>
110-
<execution>
111-
<goals>
112-
<goal>repackage</goal>
113-
</goals>
114-
</execution>
115-
</executions>
116-
</plugin>
117-
</plugins>
118-
<resources>
119-
<resource>
120-
<directory>src/main/resources</directory>
121-
<excludes>
122-
<exclude>static/console-fe/.vscode/**</exclude>
123-
</excludes>
124-
</resource>
125-
<resource>
126-
<directory>src/main/resources</directory>
127-
<filtering>true</filtering>
128-
<includes>
129-
<include>nacos-version.txt</include>
130-
</includes>
131-
</resource>
132-
</resources>
133-
</build>
134-
</project>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright 1999-2018 Alibaba Group Holding Ltd.
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
Unless required by applicable law or agreed to in writing, software
9+
distributed under the License is distributed on an "AS IS" BASIS,
10+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
See the License for the specific language governing permissions and
12+
limitations under the License.
13+
-->
14+
<project xmlns="http://maven.apache.org/POM/4.0.0"
15+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
17+
<modelVersion>4.0.0</modelVersion>
18+
<parent>
19+
<groupId>com.alibaba.nacos</groupId>
20+
<artifactId>nacos-all</artifactId>
21+
<version>1.0.1</version>
22+
</parent>
23+
<artifactId>nacos-console</artifactId>
24+
<!--<packaging>war</packaging>-->
25+
<packaging>jar</packaging>
26+
<name>nacos-console ${project.version}</name>
27+
<url>http://maven.apache.org</url>
28+
<properties>
29+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
30+
</properties>
31+
<dependencies>
32+
33+
<dependency>
34+
<groupId>${project.groupId}</groupId>
35+
<artifactId>nacos-config</artifactId>
36+
</dependency>
37+
<dependency>
38+
<groupId>org.apache.tomcat.embed</groupId>
39+
<artifactId>tomcat-embed-jasper</artifactId>
40+
<version>7.0.59</version>
41+
</dependency>
42+
<dependency>
43+
<groupId>${project.groupId}</groupId>
44+
<artifactId>nacos-naming</artifactId>
45+
</dependency>
46+
<!-- log -->
47+
<!-- log4j通过slf4j来代理 -->
48+
<dependency>
49+
<groupId>org.slf4j</groupId>
50+
<artifactId>log4j-over-slf4j</artifactId>
51+
</dependency>
52+
<!-- apache commons logging通过slf4j来代理 -->
53+
<dependency>
54+
<groupId>org.slf4j</groupId>
55+
<artifactId>jcl-over-slf4j</artifactId>
56+
</dependency>
57+
<!-- java.util.logging 通过slf4j来代理 -->
58+
<dependency>
59+
<groupId>org.slf4j</groupId>
60+
<artifactId>jul-to-slf4j</artifactId>
61+
</dependency>
62+
<!-- log -->
63+
<dependency>
64+
<groupId>org.mockito</groupId>
65+
<artifactId>mockito-core</artifactId>
66+
<scope>test</scope>
67+
</dependency>
68+
<dependency>
69+
<groupId>org.springframework.boot</groupId>
70+
<artifactId>spring-boot-starter-security</artifactId>
71+
</dependency>
72+
<dependency>
73+
<groupId>io.jsonwebtoken</groupId>
74+
<artifactId>jjwt-api</artifactId>
75+
</dependency>
76+
<dependency>
77+
<groupId>io.jsonwebtoken</groupId>
78+
<artifactId>jjwt-impl</artifactId>
79+
<scope>runtime</scope>
80+
</dependency>
81+
<dependency>
82+
<groupId>io.jsonwebtoken</groupId>
83+
<artifactId>jjwt-jackson</artifactId>
84+
<scope>runtime</scope>
85+
</dependency>
86+
</dependencies>
87+
<build>
88+
<finalName>nacos-server</finalName>
89+
<plugins>
90+
<plugin>
91+
<artifactId>maven-jar-plugin</artifactId>
92+
<configuration>
93+
<archive>
94+
<manifest>
95+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
96+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
97+
</manifest>
98+
</archive>
99+
</configuration>
100+
</plugin>
101+
<plugin>
102+
<groupId>org.springframework.boot</groupId>
103+
<artifactId>spring-boot-maven-plugin</artifactId>
104+
<version>2.1.1.RELEASE</version>
105+
<configuration>
106+
<mainClass>com.alibaba.nacos.Nacos</mainClass>
107+
<layout>ZIP</layout>
108+
</configuration>
109+
<executions>
110+
<execution>
111+
<goals>
112+
<goal>repackage</goal>
113+
</goals>
114+
</execution>
115+
</executions>
116+
</plugin>
117+
</plugins>
118+
<resources>
119+
<resource>
120+
<directory>src/main/resources</directory>
121+
<excludes>
122+
<exclude>static/console-fe/.vscode/**</exclude>
123+
</excludes>
124+
</resource>
125+
<resource>
126+
<directory>src/main/resources</directory>
127+
<filtering>true</filtering>
128+
<includes>
129+
<include>nacos-version.txt</include>
130+
</includes>
131+
</resource>
132+
</resources>
133+
</build>
134+
</project>

0 commit comments

Comments
 (0)