update

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.yutou.jianrmod</groupId>
     <artifactId>servicer</artifactId>
-    <version>2.0.2-release</version>
+    <version>2.0.4-release</version>
     <name>servicer</name>
     <description>Demo project for Spring Boot</description>
 

src/main/java/com/yutou/controller/Web/WebModController.java

@@ -6,6 +6,7 @@ import java.util.List;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.yutou.utlis.Tools;
 import org.json.JSONObject;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,7 +39,7 @@ public class WebModController {
 		JSONObject json = new JSONObject();
 		List<TMod> list=new ArrayList<>();
 		try {
-			JSONObject user=new JSONObject(RedisUtlis.get(request.getSession().getId()));
+			JSONObject user=new JSONObject(RedisUtlis.get(Tools.getCookie(request,"login")));
 			list = modService.getUserOfId(user.getInt("id"));
 		} catch (Exception e) {
 			// TODO: handle exception

src/main/java/com/yutou/controller/Web/WebUploadModController.java

@@ -50,7 +50,9 @@ public class WebUploadModController {
 		data=new JSONObject(_json);
 		User user=null;
 		try {
-			user=userService.getUser((int) Integer.valueOf(RedisUtlis.get(request.getSession().getId())));
+			JSONObject ujson=new JSONObject(RedisUtlis.get(Tools.getCookie(request,"login")));
+			int uid =  ujson.getInt("uid");
+			user=userService.getUser(uid);
 		} catch (Exception e) {
 			// TODO: handle exception
 			e.printStackTrace();
@@ -95,12 +97,15 @@ public class WebUploadModController {
 	public String upload_icon(@RequestParam(value = "icon", required = false) MultipartFile file,HttpServletRequest request) {
 		JSONObject json=new JSONObject();
 		try {
-			String url=Tools.createFile(request, "mods/"+request.getParameter("path")+"/", file,"icon.png");
+			String url=Tools.createFile(request, "mods"+"/"+request.getParameter("path")+"/", file,"icon.png");
 			json.put("id", 1);
 			json.put("url", ServiceStaticValue.SERVICE_URL+url);
 			json.put("path", request.getParameter("path"));
-			Log.i("上传", Tools.getRootModsPath(request)+request.getParameter("path")+"/lock");
+			Log.i("上传", Tools.getRootModsPath(request)+request.getParameter("path")+File.separator+"lock");
-			new File(Tools.getRootModsPath(request)+request.getParameter("path")+"/lock").createNewFile();
+			if(!new File(Tools.getRootModsPath(request)+request.getParameter("path")+File.separator).exists()){
+				new File(Tools.getRootModsPath(request)+request.getParameter("path")+File.separator).mkdirs();
+			}
+			new File(Tools.getRootModsPath(request)+request.getParameter("path")+File.separator+"lock").createNewFile();
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();

src/main/java/com/yutou/controller/android/ModController.java

@@ -68,17 +68,18 @@ public class ModController {
 		int min, max;
 		JSONObject json = new JSONObject();
 		try {
-			min = Integer.valueOf(min_str);
+			min = Integer.parseInt(min_str);
 		} catch (Exception e) {
 			// TODO: handle exception
 			min = -1;
 		}
 		try {
-			max = Integer.valueOf(max_str);
+			max = Integer.parseInt(max_str);
 		} catch (Exception e) {
 			// TODO: handle exception
 			max = -1;
 		}
+		max=99999;
 		int uPower = 0;
 		if ((boolean) request.getAttribute(LOGINSTATE)) {
 			try {

src/main/java/com/yutou/controller/test.java

@@ -3,15 +3,13 @@ package com.yutou.controller;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.Base64;
+import java.util.*;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.List;
 import java.util.zip.GZIPInputStream;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.alibaba.fastjson.JSONObject;
 import com.yutou.jianrdb.Mapper.MapNodeService;
 import com.yutou.maptop.Bean.UserTeam;
 import com.yutou.maptop.services.UserTeamService;
@@ -25,6 +23,7 @@ import com.yutou.mybatis.TMod;
 import com.yutou.services.ModService;
 import com.yutou.utlis.AESTools;
 import com.yutou.utlis.RedisUtlis;
+import redis.clients.jedis.Jedis;
 
 
 @Controller
@@ -40,6 +39,7 @@ public class test {
 
         return JSON.toJSONString(service.selectMapName());
     }
+
     private static int index = 0;
 
 
@@ -50,6 +50,7 @@ public class test {
         tmp = RedisUtlis.set(key, value);
         return tmp + "";
     }
+
     @RequestMapping("/redis/get.do")
     @ResponseBody
     public String get(String key) {
@@ -57,6 +58,7 @@ public class test {
         value = RedisUtlis.get(key);
         return value;
     }
+
     @RequestMapping("/cookie/get.do")
     @ResponseBody
     public String cookies(HttpServletRequest request) {
@@ -72,6 +74,38 @@ public class test {
         return cookie;
     }
 
+    @RequestMapping("/cnmglz/excel.do")
+    @ResponseBody
+    public String addIp(HttpServletRequest request, String type) {
+        if (Tools.StringIsEmpty(type)) {
+            String ip = Tools.getRemoteAddress(request);
+            String redis = RedisUtlis.get("ip_" + ip);
+            if (redis==null||redis.equals("-999")) {
+                redis = "1";
+            } else {
+                redis = Integer.parseInt(redis) + 1 + "";
+            }
+            RedisUtlis.set("ip_" + ip, redis);
+        } else {
+            Jedis jedis = RedisUtlis.getRedis();
+            Set<String> keys = jedis.keys("*");
+            String data = "";
+            for (String key : keys) {
+                if (type.equals("del")) {
+					jedis.del(key);
+                }else {
+					if (key.startsWith("ip_")) {
+						data += "ip=" + key.replace("ip_", "") + " num=" + jedis.get(key) + "\n";
+					}
+				}
+            }
+            jedis.close();
+            return data;
+        }
+        return "";
+    }
+
+
     public static void main(String[] args) {
         String data = "qobgbw9QQxWj9p3GayjP1uaRO1yXq/pIo+FHc16dUxU0yZqHXzI1w63RgH6xtSWV4cmGpqZFy7dD8ZD1PAKYG1xGGM66zfi+ok4nsJ1culeMEyawSqG53/zj4+F//DMEEsAUCZyJu2vrP+2MzzwcvkUM62Fd9zVvBjlx2IHn7DM55hKnaEjN9qXlb9TLWsuOEHb877/CIUieHPHuWN0oCENANgUnqycNc6w2XNIWCzcqHPKnR1wz82TxbUFggDCjWYQwysYNNS6DG0JSVE+1opDABPsxc5N2g8c7v6Q0Q969Z749dQl0uJEJiJMUNxN16vcmDH7ZEN7FQQWMfUSV+eFi5u5LCEX2TgHhcUkVS2sPlBAGHZ3/6TmmQdcEyEdz2pJXaFUMnjcJiYgZo32Mm6AssXD2EazJJYJ3mEATYtby3vdw5W/VeDotmTSpXabCScpXOh4C0fBBPZM32+6SRR5aAbh8hI6Ts3CY7NkI7Y2xJS/ASmUOBc+RBNu+s5l2NAsfhubLLxUsrpZKh1TvrOcZv8JJQlE3QRq/QZlk9cFXUFMY7hFQLh2hyLTMqzTxYNEgXyXdOplvq+Aw5Tn+9F5lfTzv+GvnU5/agF6MxPqvrZywsTp0ZOFabigghQlK8MneHnSFfpoiuFqjtKhAzQib07yRp05Q+NNK7qSaxBqaZsWnt76NM5gBwHNhE8Jm1N+8uT9WkqA5Cht0DJgqfbb7qybLAgsvUdlPQB6e1oZ/0qjbDO+7vIP62Bio3BpxTgAND4QQlTHuoLSsV0dBrT+UeiM5FByH6yTDpb9qZMNA5867YuUhmoXZ3q8v05IlUeE/V8a6kDE83oJd7LQeISIKkMeYxC6arXwK7bdpapufFQN4+29rzzeXrDyXG2okuiImBmd5BgX6Lr6Ocn8HgDRbiQjarn4q5UD7uAjCHy920j/G9vDD9p64/vmMjzpNFduyyOUAckcvNqPIWjQcpj/wajrH2cH4JQXjPAUHT9PBNxCJT4wOdgOYH48Z3QBhmC/ZtVuUOdm82IG7ilEngrSojMCgosi3jVt21L25iblTjSlgoL50G8XJ00zDvyHOqUPJe9MBI6BGFW/uGPBBZFo6S8xEVlTk3+ACft5kPKMMWr5FqB9nPiamyhE/dFzCBJt0PAe/oCX4uQPvCV0x3s5BKCLneWc/DUGnycR+mF/AWjEyqoNwHMKUcpcSQmj7bsMPOdvnOMOHqOzZUb1/4CG0yrYBP6Q1LxR27HKqpMPUvznL36dWblFbdnDA2vz7ONXnQW8aZ9BZ1X1Q2PvQr1eeW5WqbL3gD0Mbd3Do6XTSJfI8f9jFbEK5q2NpkCK4YwXkBo1gDDQH8qFaOZEiziUArAS4qjjoiU6v9UNtwDjjLjXbmSYk7LMjqfIVZkBNIJgshKiVbk9kQxl0v40dTXmx/r4D1R6P7R7vu8Jp+CIPX9HKS0L+bQyh+rZ8s66Zg1JXAp+KpWWMmIPek+6lApMnJ7nk2Np0K6BOiQsRTSmmIjvJMHZxHWEFjoTUaOzR1HcMQhigIgN+i+lVaJfbnDU2F3CTMkZvZa2oAOCyXgu0RCJ5lfifn1fSNHUNsRED3fx19UXvPRhnmQBV4KQn7R0dbeXK0NMbsyyUo3eSNljBk63mQ4ENLK2nfJBdKYs9Y6da7zEqNaJzWqXe9fQJgrZyGbUYDXaKWPJgU8NzRAsE1V0+9uC/LgPoXyLcbkUfveHLKAWleJMXkkFZiyszLRlH+k51sih0qCwjikmuRtlqUgVxIACHwT/DegZTmp+FmONzy49Hs+BZBgJnR8BiWrPKivUsrq/BALzxJfLpK9F0DpgYqJfsAlr54MNA2pzVGFvLNt+oAmv8rMNuPjddxyvPjTOGWDDxEvc9CWn8eBoXCHvR2I16yTG6SDEZwmyS+slroovf10d4cjUSwjzIOnVEj4SwZQardLRktOH0wqhi5jPkSmaFhxagJxbH0XjSH8OdtJPjFNQqAjKVW0VOm0Qsr402Fivx243yiys7ZYA7TfZUAxcN7pwo27EQdwzXCFggy0iIdHzgIyS889Fkh1grwa42r4fLUizkgN4Q2+CC+4V2ZKQA6KqJAWJ89febOTmkTj8GtwPec7JRe8qKroI2zT7yfRste4M6MokAzotOiiqgEsYGw7bm+K4svgBwBiydfTFi1mWz4kSR61mI6xfXGvRLDzWiVNlYalsr/egshgVf2h00iX+A8olUtddxVXCoX5/YyYe2PVaQb3EgnE8JHX5JsGuymYqgjQdzaxp8o8bpSlCTGT3so5o5hlkzU2M/TMQMt0n/dfgVq4x1gGzJ6qgU1SHgn47pEnEzP4TJ5DrmoltTEGgISqCdQVNt90OYKXtkE9qWQDmqxtT3vuTbfzwNh7J651WVSCeoQlt26/GJwscfRZ2PcqT/86kO+nWPdZcvgI/lLovzYtcV5wlFg+BknsfHA41DI9SL6aL+dfYQ81/wHhrB8WmUWKmg0C0eYJ1ZMiDq4WHgn9LXerFFxd4kB8JvJQQ94b7MVzMhyTg994PnHwrKe4Fv0oRK5LGDFrQvKBYVyXPlIvs8e7pQw4WQnGZPY9aUTR1TszIo2K4Xvq/087/fGZxZZj0+XQ3sdRo3rypSy/y7RhgNjBHXzjOVLGhyitg9eCv4B8+KCZ9AVxvwX3kfTmhxqjPFkxXfFNoa3HVQ/wJlUmnkLmfj/124DSccUHkIwUwBmIdbWKMyA8chsJOTEaFMAc845ypd7/DvIVP9aAekBEopR/kpC5O2SCh+LOdxFy4wW1986LQoomD5h+s8nfaLiVWD5Kvy6/3Q2PcXoisKLnCJDWrv1Mew7Rjo/c+F2CwcugMYSaCuBZEbUDiQ578+LWLk50KYn5VWXQZilcrKif2nQBgiBZV1XYZJp9UsFWroFlCC1KZUBfDLqXpCfiEMIi1BLp0RPs4eWyfUF8OhYBaJxkQuxzAulbtgR5oluTLuc3oetoIc4WE0FCT8DdJXBcfTvQkbBKKAWT8hFGmGK4tP8Tuza0JAX7AG/xD/83OMSz0YhTX3mxGL1JCBW7onLrKmtFhFqbE3EfbbSy1lF+HfCl4ohzqybLtvivz5AtGXDtzXklNC2vSfA9iiZzYatI9V1PhSDc5VPHsn01P44gX+O+LvIV+aKaA/iE2KIx863Qzif3mFbG/ndr2QNbuOWWjx3S47CX/V8KDtMjMh7iONN1XyGdQsBebDbwj+cAPfdnO9meysj9mfaJbl++BtMR/neo2vbEN8SRj7PkJvMRnXnrmFHYDkZzXrKvkNL9TP7YcIfi9OpKYfOpf+QoWh11HqOMppHcY7BMWt8PEtr/NqZQ4gYqWqt1jPjlaA08KFhIBRoOwarT4d5ByZZNWbzyJlts9rFVfao/TIK2GNcreggug/7xl5DZppJtMaUUk4VXZ3YTw4AxVlqjcBJuc25oxlQwFgM5qq7t6DFkeEmJik1W1Vw2MvRtAJmYoe+gKz8AvOo7cYGpkzS3lDw9Tj+iNfKnfNQ+5ETc5ZR5UHEHbiA7YS7Hqblq4fz+lVozo2n3OL93BnffYSqPbrYuiYPDgelWdTVGLZwAj1kr+cgcU5/g==";
         byte[] bytes = Base64.getDecoder().decode(data);

src/main/java/com/yutou/utlis/APIFilter.java

@@ -7,8 +7,7 @@ import javax.servlet.annotation.WebFilter;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 
-@Component
+
-@WebFilter
 public class APIFilter implements Filter {
     @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {

src/main/java/com/yutou/utlis/Tools.java

@@ -36,7 +36,7 @@ public class Tools {
 	 * @throws Exception
 	 */
 	public static String createFile(HttpServletRequest request, String path, MultipartFile file,String type) throws Exception {
-		String savePath = request.getServletContext().getRealPath("/") + "/" + path;
+		String savePath =new File("").getAbsolutePath()+File.separator +"html"+File.separator+  path;
 	//	savePath=savePath.replace("/", "\\");
 		File servicePath = new File(savePath);
 		if (!servicePath.exists()) {
@@ -57,7 +57,7 @@ public class Tools {
 		//String url = oss.upload(saveFile, path);
 		//oss.close();
 		fileName=URLEncoder.encode(fileName,"UTF-8");
-		Log.i("上传文件保存路径："+(path+fileName));
+		Log.i("上传文件保存路径："+saveFile.getAbsolutePath());
 		return path+fileName;
 	}
 	/**
@@ -498,10 +498,10 @@ public class Tools {
 		}
 	}
 	public static String getRootModsPath(HttpServletRequest request) {
-		return request.getServletContext().getRealPath("/") + "/"+"mods/";
+		return new File("").getAbsolutePath() + File.separator+"html"+File.separator+"mods"+File.separator;
 	}
 	public static String getRootPath(HttpServletRequest request) {
-		return request.getServletContext().getRealPath("/") + "/";
+		return new File("").getAbsolutePath() +File.separator;
 	}
 	public static JSONObject isLogin(HttpServletRequest request,String... args) {
 		JSONObject json=new JSONObject();