Skip to content

Commit bb95409

Browse files
committed
规划调整目录结构
1 parent a5026af commit bb95409

File tree

16 files changed

+137
-57
lines changed

16 files changed

+137
-57
lines changed

conf/.merkle

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#add nbs1.0.rar
2+
#Tue Jun 26 18:13:02 CST 2018
3+
QmdNQYHjg2d6PKsXu5DSRWJHPUgSMVqWttAAp3bqaHq2Z8=Girls-Gee-\u300Aoh\u300B.mp3
4+
Qmc5QhR1WeUhGW12tT3WND3qxfLRmnci1PYjogjGy56X3n=Monica.mp3
5+
QmWuoJzhZkMjEe9ybfFeaSn6jDzTgvPd6UkC6RLZUbZVyf=NBS.jpg
6+
QmfK5QwVKDod3Bwjdmcgyf1qGxEzmGayfSSFTcv4BxxRXR=nbs.rp
7+
QmQD445aW3Ge6bgD6Lv9RJG48WfveAMgXket15GYsuysYb=nbs.rp
8+
QmeLUM8e8WRKBLsRp3Pme39yiTz4nTMGURm7unUQbrWhCn=\u5FAE\u4FE1\u56FE\u7247_20180608230516.jpg
9+
QmNgp7Lt1JYRiWYVpzV7s8nUxeHgScudkSbn36p8HmySAY=nbs1.0.rar
10+
QmW4dKs2KXqCWc9TQXzSc41HTNBPtFJJf7crwSbLGkQmVa=nbs64.png
11+
QmfFhhc1Woo4hE5d14jBPdotng7j9vx6UA4My8Xk597Di8=nbs1.0.rar

conf/logo.png

8.17 KB
Loading
File renamed without changes.
File renamed without changes.
File renamed without changes.

pom.xml

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@
8282
<build>
8383
<finalName>nbs-client4j1.0</finalName>
8484
<resources>
85-
<!-- <resource>
86-
<directory>${project.basedir}/config/**</directory>
87-
<targetPath>${project.build.outputDirectory}/config</targetPath>
88-
</resource>-->
85+
<resource>
86+
<directory>conf/**</directory>
87+
<targetPath>${build.outputDirectory}/</targetPath>
88+
</resource>
8989
</resources>
9090
<plugins>
9191
<plugin>
@@ -98,7 +98,30 @@
9898
<encoding>UTF-8</encoding>
9999
</configuration>
100100
</plugin>
101-
101+
<plugin>
102+
<artifactId>maven-resources-plugin</artifactId>
103+
<version>3.1.0</version>
104+
<executions>
105+
<execution>
106+
<id>copy-xmls</id>
107+
<phase>process-sources</phase>
108+
<goals>
109+
<goal>copy-resources</goal>
110+
</goals>
111+
<configuration>
112+
<outputDirectory>${basedir}/out/bin/conf</outputDirectory>
113+
<resources>
114+
<resource>
115+
<directory>${basedir}/conf</directory>
116+
<includes>
117+
<include>**/*</include>
118+
</includes>
119+
</resource>
120+
</resources>
121+
</configuration>
122+
</execution>
123+
</executions>
124+
</plugin>
102125
<plugin>
103126
<groupId>org.apache.maven.plugins</groupId>
104127
<artifactId>maven-jar-plugin</artifactId>
@@ -148,12 +171,12 @@
148171
</executions>
149172
<configuration>
150173
<assembleDirectory>${project.basedir}/out</assembleDirectory>
151-
<repositoryLayout>flat</repositoryLayout>
174+
<repositoryLayout>default</repositoryLayout>
152175
<repositoryName>lib</repositoryName>
153176
<binFolder>bin</binFolder>
177+
<copyConfigurationDirectory>true</copyConfigurationDirectory>
154178
<configurationDirectory>conf</configurationDirectory>
155179
<configurationSourceDirectory>src/main/resources</configurationSourceDirectory>
156-
<configurationDirectory>true</configurationDirectory>
157180
<includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
158181
<encoding>UTF-8</encoding>
159182
<logsDirectory>logs</logsDirectory>

profile/.merkle

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +0,0 @@
1-
#add nbs1.0.rar
2-
#Tue Jun 26 18:13:02 CST 2018
3-
QmdNQYHjg2d6PKsXu5DSRWJHPUgSMVqWttAAp3bqaHq2Z8=Girls-Gee-\u300Aoh\u300B.mp3
4-
Qmc5QhR1WeUhGW12tT3WND3qxfLRmnci1PYjogjGy56X3n=Monica.mp3
5-
QmWuoJzhZkMjEe9ybfFeaSn6jDzTgvPd6UkC6RLZUbZVyf=NBS.jpg
6-
QmfK5QwVKDod3Bwjdmcgyf1qGxEzmGayfSSFTcv4BxxRXR=nbs.rp
7-
QmQD445aW3Ge6bgD6Lv9RJG48WfveAMgXket15GYsuysYb=nbs.rp
8-
QmeLUM8e8WRKBLsRp3Pme39yiTz4nTMGURm7unUQbrWhCn=\u5FAE\u4FE1\u56FE\u7247_20180608230516.jpg
9-
QmNgp7Lt1JYRiWYVpzV7s8nUxeHgScudkSbn36p8HmySAY=nbs1.0.rar
10-
QmW4dKs2KXqCWc9TQXzSc41HTNBPtFJJf7crwSbLGkQmVa=nbs64.png
11-
QmfFhhc1Woo4hE5d14jBPdotng7j9vx6UA4My8Xk597Di8=nbs1.0.rar

src/main/java/UI/AppMainWindow.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ public class AppMainWindow {
114114
public static Map<String,ContactsItem> peerItems = new HashMap<>();
115115

116116
public static void main(String[] args){
117+
String basedir = System.getProperty("user.dir");
118+
System.out.println(System.getProperty("nbs.client.root",basedir));
117119
EventQueue.invokeLater(
118120
new Runnable() {
119121
@Override
@@ -164,7 +166,7 @@ private void loadWorldControllerListener(ImPeersService service){
164166
AtomicInteger size = new AtomicInteger(0);
165167
new Thread(()->{
166168
logger.info("Start up the World Controller Message........");
167-
IPFS worldIpfs = new IPFS(ConfigHelper.getIpfsAddress());
169+
IPFS worldIpfs = new IPFS(ConfigHelper.getInstance().getIpfsAddress());
168170
while (true){
169171
try{
170172
TimeUnit.MILLISECONDS.sleep(100);
@@ -262,8 +264,7 @@ private void initialize(){
262264
*/
263265
private void loadEnv(){
264266
logger.info("=====>>>>>>> NBS Chain Client4J ENV initializing......");
265-
Properties props = ConfigHelper.getEnv();
266-
267+
Properties props = ConfigHelper.getInstance().getEnv();
267268
for(String k : props.stringPropertyNames()){
268269
String v = props.getProperty(k);
269270
logger.info(k+"="+v);

0 commit comments

Comments
 (0)