Skip to content

Commit 368115a

Browse files
zangyilinzangyilin
committed
清理
1 parent 6a921bd commit 368115a

15 files changed

Lines changed: 165 additions & 422 deletions

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ produce it from the Program, in the form of source code under the
212212
terms of section 4, provided that you also meet all of these conditions:
213213

214214
a) The work must carry prominent notices stating that you modified
215-
it, and giving a relevant date.
215+
it, and giving a relevant from.
216216

217217
b) The work must carry prominent notices stating that it is
218218
released under this License and any conditions added under section

‎pom.xml‎

Lines changed: 102 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -84,77 +84,120 @@
8484
<plugins>
8585
<plugin>
8686
<groupId>org.apache.maven.plugins</groupId>
87-
<artifactId>maven-compiler-plugin</artifactId>
88-
<configuration>
89-
<source>1.8</source>
90-
<target>1.8</target>
91-
</configuration>
92-
</plugin>
93-
<plugin>
94-
<groupId>org.apache.maven.plugins</groupId>
95-
<artifactId>maven-dependency-plugin</artifactId>
87+
<artifactId>maven-shade-plugin</artifactId>
88+
<version>2.4.3</version>
9689
<executions>
9790
<execution>
98-
<id>copy-dependencies</id>
99-
<phase>prepare-package</phase>
91+
<phase>package</phase>
10092
<goals>
101-
<goal>copy-dependencies</goal>
93+
<goal>shade</goal>
10294
</goals>
10395
<configuration>
104-
<outputDirectory>${project.build.directory}/lib</outputDirectory>
105-
<overWriteReleases>true</overWriteReleases>
106-
<overWriteSnapshots>true</overWriteSnapshots>
107-
<overWriteIfNewer>true</overWriteIfNewer>
96+
<filters>
97+
<filter>
98+
<artifact>*:*</artifact>
99+
<excludes>
100+
<exclude>META-INF/*.SF</exclude>
101+
<exclude>META-INF/*.DSA</exclude>
102+
<exclude>META-INF/*.RSA</exclude>
103+
</excludes>
104+
</filter>
105+
</filters>
106+
<transformers>
107+
<transformer
108+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
109+
<mainClass>com.javabaas.shell.Main</mainClass>
110+
</transformer>
111+
<transformer
112+
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
113+
<resource>META-INF/spring.handlers</resource>
114+
</transformer>
115+
<transformer
116+
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
117+
<resource>META-INF/spring.schemas</resource>
118+
</transformer>
119+
</transformers>
108120
</configuration>
109121
</execution>
110122
</executions>
111123
</plugin>
112-
<plugin>
113-
<groupId>org.apache.maven.plugins</groupId>
114-
<artifactId>maven-jar-plugin</artifactId>
115-
<configuration>
116-
<archive>
117-
<manifest>
118-
<addClasspath>true</addClasspath>
119-
<useUniqueVersions>false</useUniqueVersions>
120-
<classpathPrefix>lib/</classpathPrefix>
121-
<mainClass>${jar.mainclass}</mainClass>
122-
</manifest>
123-
<manifestEntries>
124-
<version>${project.version}</version>
125-
</manifestEntries>
126-
</archive>
127-
</configuration>
128-
</plugin>
129-
<plugin>
130-
<groupId>org.codehaus.mojo</groupId>
131-
<artifactId>appassembler-maven-plugin</artifactId>
132-
<version>1.10</version>
133-
<configuration>
134-
<repositoryLayout>flat</repositoryLayout>
135-
<repositoryName>lib</repositoryName>
136-
<programs>
137-
<program>
138-
<mainClass>com.javabaas.shell.Main</mainClass>
139-
<name>shell</name>
140-
</program>
141-
</programs>
142-
</configuration>
143-
</plugin>
144124
</plugins>
145-
146125
</build>
147126

127+
<!--<build>-->
128+
<!--<plugins>-->
129+
<!--<plugin>-->
130+
<!--<groupId>org.apache.maven.plugins</groupId>-->
131+
<!--<artifactId>maven-compiler-plugin</artifactId>-->
132+
<!--<configuration>-->
133+
<!--<source>1.8</source>-->
134+
<!--<target>1.8</target>-->
135+
<!--</configuration>-->
136+
<!--</plugin>-->
137+
<!--<plugin>-->
138+
<!--<groupId>org.apache.maven.plugins</groupId>-->
139+
<!--<artifactId>maven-dependency-plugin</artifactId>-->
140+
<!--<executions>-->
141+
<!--<execution>-->
142+
<!--<phase>package</phase>-->
143+
<!--<goals>-->
144+
<!--<goal>copy-dependencies</goal>-->
145+
<!--</goals>-->
146+
<!--<configuration>-->
147+
<!--<outputDirectory>${project.build.directory}/lib</outputDirectory>-->
148+
<!--<overWriteReleases>true</overWriteReleases>-->
149+
<!--<overWriteSnapshots>true</overWriteSnapshots>-->
150+
<!--<overWriteIfNewer>true</overWriteIfNewer>-->
151+
<!--</configuration>-->
152+
<!--</execution>-->
153+
<!--</executions>-->
154+
<!--</plugin>-->
155+
<!--<plugin>-->
156+
<!--<groupId>org.apache.maven.plugins</groupId>-->
157+
<!--<artifactId>maven-jar-plugin</artifactId>-->
158+
<!--<configuration>-->
159+
<!--<archive>-->
160+
<!--<manifest>-->
161+
<!--<addClasspath>true</addClasspath>-->
162+
<!--<useUniqueVersions>false</useUniqueVersions>-->
163+
<!--<classpathPrefix>lib/</classpathPrefix>-->
164+
<!--<mainClass>${jar.mainclass}</mainClass>-->
165+
<!--</manifest>-->
166+
<!--<manifestEntries>-->
167+
<!--<version>${project.version}</version>-->
168+
<!--</manifestEntries>-->
169+
<!--</archive>-->
170+
<!--</configuration>-->
171+
<!--</plugin>-->
172+
<!--<plugin>-->
173+
<!--<groupId>org.codehaus.mojo</groupId>-->
174+
<!--<artifactId>appassembler-maven-plugin</artifactId>-->
175+
<!--<version>1.10</version>-->
176+
<!--<configuration>-->
177+
<!--<repositoryLayout>flat</repositoryLayout>-->
178+
<!--<repositoryName>lib</repositoryName>-->
179+
<!--<programs>-->
180+
<!--<program>-->
181+
<!--<mainClass>com.javabaas.shell.Main</mainClass>-->
182+
<!--<name>shell</name>-->
183+
<!--</program>-->
184+
<!--</programs>-->
185+
<!--</configuration>-->
186+
<!--</plugin>-->
187+
<!--</plugins>-->
188+
189+
<!--</build>-->
190+
148191

149-
<repositories>
150-
<repository>
151-
<id>libs-milestone</id>
152-
<url>http://repo.spring.io/libs-milestone/</url>
153-
</repository>
154-
<repository>
155-
<id>libs-release</id>
156-
<url>http://repo.spring.io/libs-release/</url>
157-
</repository>
158-
</repositories>
192+
<!--<repositories>-->
193+
<!--<repository>-->
194+
<!--<id>libs-milestone</id>-->
195+
<!--<url>http://repo.spring.io/libs-milestone/</url>-->
196+
<!--</repository>-->
197+
<!--<repository>-->
198+
<!--<id>libs-release</id>-->
199+
<!--<url>http://repo.spring.io/libs-release/</url>-->
200+
<!--</repository>-->
201+
<!--</repositories>-->
159202

160203
</project>

‎src/main/java/com/javabaas/shell/Main.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.javabaas.shell;
22

33
import com.javabaas.javasdk.JBConfig;
4+
import com.javabaas.shell.util.PropertiesUtil;
45
import org.springframework.shell.Bootstrap;
56

67
import java.io.IOException;
@@ -10,8 +11,10 @@
1011
*/
1112
public class Main {
1213

14+
1315
public static void main(String[] args) throws IOException {
14-
JBConfig.initAdmin("http://127.0.0.1:9000/api", "JavaBaas");
16+
PropertiesUtil properties = new PropertiesUtil();
17+
JBConfig.initAdmin(properties.getHost(), properties.getKey());
1518
Bootstrap.main(args);
1619
}
1720

‎src/main/java/com/javabaas/shell/commands/ApiStatCommands.java‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
package com.javabaas.shell.commands;
22

3+
import com.javabaas.javasdk.JBApp;
34
import com.javabaas.shell.common.CommandContext;
4-
import com.javabaas.shell.util.PropertiesUtil;
55
import org.springframework.beans.factory.annotation.Autowired;
66
import org.springframework.shell.core.CommandMarker;
77
import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
88
import org.springframework.shell.core.annotation.CliCommand;
99
import org.springframework.stereotype.Component;
10-
import org.springframework.web.client.RestTemplate;
1110

12-
import javax.annotation.Resource;
1311
import java.text.SimpleDateFormat;
1412
import java.util.Calendar;
1513
import java.util.Date;
1614
import java.util.GregorianCalendar;
15+
import java.util.List;
1716

1817
/**
1918
* Created by Staryet on 15/8/20.
@@ -25,17 +24,13 @@ public class ApiStatCommands implements CommandMarker {
2524

2625
@Autowired
2726
private CommandContext context;
28-
@Autowired
29-
private PropertiesUtil propertiesUtil;
30-
@Resource(name = "MasterRestTemplate")
31-
private RestTemplate rest;
3227

3328
@CliAvailabilityIndicator({"stat"})
3429
public boolean isAvailable() {
3530
return context.getCurrentApp() != null;
3631
}
3732

38-
@CliCommand(value = "stat", help = "Show ApiStat.")
33+
@CliCommand(value = "stat", help = "Show JBApiStat.")
3934
public String stat() {
4035
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
4136
Calendar calendar = new GregorianCalendar();
@@ -45,8 +40,9 @@ public String stat() {
4540
String fromString = simpleDateFormat.format(from);
4641
String toString = simpleDateFormat.format(to);
4742
//显示列表
48-
String result = rest.getForObject(propertiesUtil.getHost() + "master/apiStat?from={from}&to={to}", String.class, fromString, toString);
49-
System.out.println(result);
43+
JBApp.JBApiStat apiStat = new JBApp.JBApiStat(null, null, null, fromString, toString);
44+
List<Long> list = JBApp.getApiStat(apiStat);
45+
System.out.println(list);
5046
return null;
5147
}
5248

‎src/main/java/com/javabaas/shell/commands/AppCommands.java‎

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.javabaas.javasdk.JBApp;
55
import com.javabaas.javasdk.JBUtils;
66
import com.javabaas.shell.common.CommandContext;
7+
import com.javabaas.shell.util.ASKUtil;
78
import com.javabaas.shell.util.PropertiesUtil;
89
import com.javabaas.shell.util.SignUtil;
910
import org.fusesource.jansi.Ansi;
@@ -14,9 +15,8 @@
1415
import org.springframework.shell.core.annotation.CliOption;
1516
import org.springframework.stereotype.Component;
1617
import org.springframework.web.client.HttpClientErrorException;
17-
import org.springframework.web.client.RestTemplate;
1818

19-
import javax.annotation.Resource;
19+
import java.util.ArrayList;
2020
import java.util.List;
2121
import java.util.UUID;
2222

@@ -30,10 +30,6 @@ public class AppCommands implements CommandMarker {
3030

3131
@Autowired
3232
private CommandContext context;
33-
@Resource(name = "AdminRestTemplate")
34-
private RestTemplate rest;
35-
@Resource(name = "MasterRestTemplate")
36-
private RestTemplate masterRest;
3733
@Autowired
3834
private SignUtil signUtil;
3935
@Autowired
@@ -190,21 +186,39 @@ public void token() {
190186
}
191187

192188
@CliCommand(value = "account", help = "Set Account.")
193-
public void setAccount(@CliOption(key = {""}, mandatory = true, help = "Input") final String input) throws JsonProcessingException {
189+
public void setAccount() throws JsonProcessingException {
194190
context.cancelDoubleCheck();
195-
String[] inputs = input.split(" ");
196-
if (inputs.length < 2) {
197-
System.out.println(Ansi.ansi().fg(Ansi.Color.RED).a("No Account!").reset());
198-
return;
199-
}
200-
String type = inputs[0];
201-
String account = inputs[1];
202191
try {
203-
masterRest.put(properties.getHost() + "master/account/setAccount/" + type, account);
192+
List<String> accountTypes = getAccountTypes();
193+
int accountType = ASKUtil.askNumber(accountTypes, "请选择Account Type， 默认为push", 1);
194+
String key = ASKUtil.askString("请输入key值");
195+
if (JBUtils.isEmpty(key)) {
196+
System.out.println("Set Account End!");
197+
return;
198+
}
199+
String secret = ASKUtil.askString("请输入secret值");
200+
if (JBUtils.isEmpty(secret)) {
201+
System.out.println("Set Account End!");
202+
return;
203+
}
204+
205+
JBApp.Account account = new JBApp.Account();
206+
account.setKey(key);
207+
account.setSecret(secret);
208+
209+
JBApp.setAccount(JBApp.AccountType.getType(accountType), account);
204210
System.out.println(Ansi.ansi().fg(Ansi.Color.GREEN).a("Object updated.").reset());
205211
} catch (HttpClientErrorException e) {
206212
System.out.println(Ansi.ansi().fg(Ansi.Color.RED).a(e.getResponseBodyAsString()).reset());
207213
}
208214
}
209215

216+
private List<String> getAccountTypes() {
217+
List<String> list = new ArrayList<>();
218+
for (JBApp.AccountType type : JBApp.AccountType.values()) {
219+
list.add(type.getValue());
220+
}
221+
return list;
222+
}
223+
210224
}

‎src/main/java/com/javabaas/shell/commands/ClassAclCommands.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.javabaas.javasdk.JBClazz;
55
import com.javabaas.javasdk.JBUtils;
66
import com.javabaas.shell.common.CommandContext;
7-
import com.javabaas.shell.util.PropertiesUtil;
87
import org.fusesource.jansi.Ansi;
98
import org.springframework.beans.factory.annotation.Autowired;
109
import org.springframework.shell.core.CommandMarker;
@@ -13,9 +12,6 @@
1312
import org.springframework.shell.core.annotation.CliOption;
1413
import org.springframework.stereotype.Component;
1514
import org.springframework.web.client.HttpClientErrorException;
16-
import org.springframework.web.client.RestTemplate;
17-
18-
import javax.annotation.Resource;
1915

2016
/**
2117
* Created by Staryet on 15/8/20.
@@ -27,10 +23,6 @@ public class ClassAclCommands implements CommandMarker {
2723

2824
@Autowired
2925
private CommandContext context;
30-
@Autowired
31-
private PropertiesUtil properties;
32-
@Resource(name = "MasterRestTemplate")
33-
private RestTemplate rest;
3426

3527
@CliAvailabilityIndicator({"acls", "acl set"})
3628
public boolean isAvailable() {

‎src/main/java/com/javabaas/shell/commands/ClassCommands.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.javabaas.javasdk.JBClazz;
44
import com.javabaas.javasdk.JBUtils;
55
import com.javabaas.shell.common.CommandContext;
6-
import com.javabaas.shell.util.PropertiesUtil;
76
import org.fusesource.jansi.Ansi;
87
import org.springframework.beans.factory.annotation.Autowired;
98
import org.springframework.shell.core.CommandMarker;
@@ -12,9 +11,7 @@
1211
import org.springframework.shell.core.annotation.CliOption;
1312
import org.springframework.stereotype.Component;
1413
import org.springframework.web.client.HttpClientErrorException;
15-
import org.springframework.web.client.RestTemplate;
1614

17-
import javax.annotation.Resource;
1815
import java.util.List;
1916

2017
/**
@@ -27,10 +24,6 @@ public class ClassCommands implements CommandMarker {
2724

2825
@Autowired
2926
private CommandContext context;
30-
@Autowired
31-
private PropertiesUtil properties;
32-
@Resource(name = "MasterRestTemplate")
33-
private RestTemplate rest;
3427

3528
@CliAvailabilityIndicator({"classes", "set", "class add", "class del", "class export", "class import"})
3629
public boolean isAvailable() {

0 commit comments

Comments
 (0)