Commit 74609f138d92aa833501e595ac1310dd05af8242

Authored by 潘钊
1 parent dbb78ac0

update...

@@ -130,33 +130,6 @@ @@ -130,33 +130,6 @@
130 <version>0.9.1.2</version> 130 <version>0.9.1.2</version>
131 </dependency> 131 </dependency>
132 132
133 - <!-- 图表 -->  
134 - <dependency>  
135 - <groupId>com.google.code.gson</groupId>  
136 - <artifactId>gson</artifactId>  
137 - <version>2.2.4</version>  
138 - </dependency>  
139 - <dependency>  
140 - <groupId>com.github.abel533</groupId>  
141 - <artifactId>ECharts</artifactId>  
142 - <version>2.1.8</version>  
143 - </dependency>  
144 - <dependency>  
145 - <groupId>net.sourceforge.jexcelapi</groupId>  
146 - <artifactId>jxl</artifactId>  
147 - <version>2.6.12</version>  
148 - </dependency>  
149 - <dependency>  
150 - <groupId>rhino</groupId>  
151 - <artifactId>js</artifactId>  
152 - <version>1.7R2</version>  
153 - </dependency>  
154 - <dependency>  
155 - <groupId>javax.mail</groupId>  
156 - <artifactId>mail</artifactId>  
157 - <version>1.4.7</version>  
158 - </dependency>  
159 -  
160 <dependency> 133 <dependency>
161 <groupId>com.github.axet</groupId> 134 <groupId>com.github.axet</groupId>
162 <artifactId>kaptcha</artifactId> 135 <artifactId>kaptcha</artifactId>
@@ -174,102 +147,10 @@ @@ -174,102 +147,10 @@
174 <artifactId>bcprov-jdk15on</artifactId> 147 <artifactId>bcprov-jdk15on</artifactId>
175 <version>1.52</version> 148 <version>1.52</version>
176 </dependency> 149 </dependency>
177 - <dependency>  
178 - <groupId>axis</groupId>  
179 - <artifactId>axis</artifactId>  
180 - <version>1.4</version>  
181 - </dependency>  
182 - <dependency>  
183 - <groupId>javax.xml</groupId>  
184 - <artifactId>jaxrpc-api</artifactId>  
185 - <version>1.1</version>  
186 - </dependency>  
187 -  
188 - <dependency>  
189 - <groupId>org.apache.axis2</groupId>  
190 - <artifactId>axis2-adb</artifactId>  
191 - <version>1.7.4</version>  
192 - </dependency>  
193 - <dependency>  
194 - <groupId>org.apache.axis2</groupId>  
195 - <artifactId>axis2-transport-local</artifactId>  
196 - <version>1.7.4</version>  
197 - </dependency>  
198 - <dependency>  
199 - <groupId>org.apache.axis2</groupId>  
200 - <artifactId>axis2-transport-http</artifactId>  
201 - <version>1.7.4</version>  
202 - </dependency>  
203 -  
204 150
205 <!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-devtools</artifactId> 151 <!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-devtools</artifactId>
206 <optional>true</optional> </dependency> --> 152 <optional>true</optional> </dependency> -->
207 <dependency> 153 <dependency>
208 - <groupId>com.vividsolutions</groupId>  
209 - <artifactId>jts</artifactId>  
210 - <version>1.13</version>  
211 - </dependency>  
212 -  
213 - <dependency>  
214 - <groupId>org.dbunit</groupId>  
215 - <artifactId>dbunit</artifactId>  
216 - <version>2.4.9</version>  
217 - <scope>test</scope>  
218 -  
219 - <exclusions>  
220 - <exclusion>  
221 - <groupId>org.slf4j</groupId>  
222 - <artifactId>slf4j-api</artifactId>  
223 - </exclusion>  
224 - </exclusions>  
225 - </dependency>  
226 -  
227 - <dependency>  
228 - <groupId>com.h2database</groupId>  
229 - <artifactId>h2</artifactId>  
230 - <version>1.2.132</version>  
231 - <scope>test</scope>  
232 - </dependency>  
233 -  
234 -  
235 - <dependency>  
236 - <groupId>ojdbc</groupId>  
237 - <artifactId>ojdbc</artifactId>  
238 - <version>14</version>  
239 - </dependency>  
240 -  
241 - <dependency>  
242 - <groupId>org.apache.mina</groupId>  
243 - <artifactId>mina-core</artifactId>  
244 - <version>2.0.13</version>  
245 - </dependency>  
246 -  
247 - <dependency>  
248 - <groupId>com.google.protobuf</groupId>  
249 - <artifactId>protobuf-java</artifactId>  
250 - <version>3.3.0</version>  
251 - </dependency>  
252 -  
253 - <dependency>  
254 - <groupId>com.github.stuxuhai</groupId>  
255 - <artifactId>jpinyin</artifactId>  
256 - <version>1.1.8</version>  
257 - </dependency>  
258 -  
259 - <!-- CXF的rs客户端 -->  
260 - <dependency>  
261 - <groupId>org.apache.cxf</groupId>  
262 - <artifactId>cxf-rt-rs-client</artifactId>  
263 - <version>3.0.0-milestone1</version>  
264 - </dependency>  
265 -  
266 - <dependency>  
267 - <groupId>com.fasterxml.jackson.jaxrs</groupId>  
268 - <artifactId>jackson-jaxrs-json-provider</artifactId>  
269 - <version>2.9.0</version>  
270 - </dependency>  
271 -  
272 - <dependency>  
273 <groupId>org.apache.poi</groupId> 154 <groupId>org.apache.poi</groupId>
274 <artifactId>poi</artifactId> 155 <artifactId>poi</artifactId>
275 <version>3.15</version> 156 <version>3.15</version>
src/main/java/com/bsth/data/utils/RsRequestUtils.java
@@ -4,7 +4,6 @@ import com.bsth.util.ConfigUtil; @@ -4,7 +4,6 @@ import com.bsth.util.ConfigUtil;
4 import org.slf4j.Logger; 4 import org.slf4j.Logger;
5 import org.slf4j.LoggerFactory; 5 import org.slf4j.LoggerFactory;
6 6
7 -import javax.ws.rs.client.WebTarget;  
8 import java.security.MessageDigest; 7 import java.security.MessageDigest;
9 import java.util.*; 8 import java.util.*;
10 9
@@ -119,25 +118,4 @@ public class RsRequestUtils { @@ -119,25 +118,4 @@ public class RsRequestUtils {
119 throw e; 118 throw e;
120 } 119 }
121 } 120 }
122 -  
123 - public static WebTarget addParams(WebTarget wt) {  
124 - String rs="";  
125 - try {  
126 - String nonce = getNonce(6);  
127 - long t = System.currentTimeMillis();  
128 -  
129 - Map<String, String> map = new HashMap<>();  
130 - map.put("password", password);  
131 - map.put("timestamp", t + "");  
132 - map.put("nonce", nonce);  
133 -  
134 - String sign = getSHA1(map);  
135 -  
136 -  
137 - wt.queryParam("password", password).queryParam("timestamp", t).queryParam("nonce", nonce).queryParam("sign", sign);  
138 - }catch (Exception e){  
139 - logger.error("", e);  
140 - }  
141 - return wt;  
142 - }  
143 } 121 }