Merge branch 'dev' of http://git.xmmakeit.com/huangjiay/iot-platform-server into dev

server-api/src/main/java/com/makeit/api/external/filter/MyRequestWrapper.java

+package com.makeit.api.external.filter;
+
+import org.apache.commons.io.IOUtils;
+
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+/**
+ * @Description: 解决request.getInputStream()只能读取一次的问题
+ * @PackageName: net.dlet.dhdemo.utils.dhutils
+ * @Name: MyRequestWrapper
+ * @Author: cure
+ * @CreateDate: 2020/09/06 4:44
+ * @ModifyUser:
+ * @ModifyDate:
+ * @ModifyDesc: 修改内容
+ * @DayNameFull: 星期日
+ * @ProjectName: dhdemo
+ * @Version: 1.0
+ **/
+public class MyRequestWrapper extends HttpServletRequestWrapper {
+
+    private volatile byte[] body;
+
+    public MyRequestWrapper(HttpServletRequest request) throws IOException {
+        super(request);
+        body = IOUtils.toByteArray(super.getInputStream());
+    }
+
+    public byte[] getBody() {
+        return body;
+    }
+
+    public void setBody(byte[] body) {
+        this.body = body;
+    }
+
+    @Override
+    public BufferedReader getReader() throws IOException {
+        return new BufferedReader(new InputStreamReader(getInputStream()));
+    }
+
+    @Override
+    public ServletInputStream getInputStream() throws IOException {
+        return new RequestBodyCachingInputStream(body);
+    }
+
+    private class RequestBodyCachingInputStream extends ServletInputStream {
+        private byte[] body;
+        private int lastIndexRetrieved = -1;
+        private ReadListener listener;
+
+        public RequestBodyCachingInputStream(byte[] body) {
+            this.body = body;
+        }
+
+        @Override
+        public int read() throws IOException {
+            if (isFinished()) {
+                return -1;
+            }
+            int i = body[lastIndexRetrieved + 1];
+            lastIndexRetrieved++;
+            if (isFinished() && listener != null) {
+                try {
+                    listener.onAllDataRead();
+                } catch (IOException e) {
+                    listener.onError(e);
+                    throw e;
+                }
+            }
+            return i;
+        }
+
+        @Override
+        public boolean isFinished() {
+            return lastIndexRetrieved == body.length - 1;
+        }
+
+        @Override
+        public boolean isReady() {
+            return isFinished();
+        }
+
+        @Override
+        public void setReadListener(ReadListener listener) {
+            if (listener == null) {
+                throw new IllegalArgumentException("listener cann not be null");
+            }
+            if (this.listener != null) {
+                throw new IllegalArgumentException("listener has been set");
+            }
+            this.listener = listener;
+            if (!isFinished()) {
+                try {
+                    listener.onAllDataRead();
+                } catch (IOException e) {
+                    listener.onError(e);
+                }
+            } else {
+                try {
+                    listener.onAllDataRead();
+                } catch (IOException e) {
+                    listener.onError(e);
+                }
+            }
+        }
+
+        @Override
+        public int available() throws IOException {
+            return body.length - lastIndexRetrieved - 1;
+        }
+
+        @Override
+        public void close() throws IOException {
+            lastIndexRetrieved = body.length - 1;
+            body = null;
+        }
+    }
+}
\ No newline at end of file

server-api/src/main/java/com/makeit/api/external/filter/RequestReplaceFilter.java

-/*
-package com.makeit.api.external.filter;
-
-import org.springframework.stereotype.Component;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-*/
-/**
- * @Description:
- * @PackageName: net.dlet.dhdemo.configure
- * @Name: RequestReplaceFilter
- * @Author: cure
- * @CreateDate: 2020/09/06 4:58
- * @ModifyUser:
- * @ModifyDate:
- * @ModifyDesc: 修改内容
- * @DayNameFull: 星期日
- * @ProjectName: dhdemo
- * @Version: 1.0
- **//*
-
-@Component
-public class RequestReplaceFilter extends OncePerRequestFilter {
-
-    @Override
-    protected void doFilterInternal(HttpServletRequest request,
-                                    HttpServletResponse response,
-                                    FilterChain filterChain) throws ServletException, IOException {
-        if (!(request instanceof MyRequestWrapper)) {
-            request = new MyRequestWrapper(request);
-        }
-        filterChain.doFilter(request, response);
-    }
-}
-
-*/

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java

@@ -369,8 +369,8 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
 
 
         PlatUser platUser = getOne(new QueryWrapper<PlatUser>().lambda()
         PlatUser platUser = getOne(new QueryWrapper<PlatUser>().lambda()
                 .eq(PlatUser::getAccount, loginDTO.getAccount())
                 .eq(PlatUser::getAccount, loginDTO.getAccount())
-                .or()
-                .eq(PlatUser::getMobile, loginDTO.getAccount())
+                //.or()
+                //.eq(PlatUser::getMobile, loginDTO.getAccount())
         );
         );
         if(platUser == null ){
         if(platUser == null ){
             throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_AUTH_USER_HAS_DISABLED);
             throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_AUTH_USER_HAS_DISABLED);