common 模块添加 cn.reghao.tnb.common.web 包, 不再使用 cn.reghao.jutil.web 依赖

account/account-service/pom.xml

@@ -39,10 +39,6 @@
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

account/account-service/src/main/java/cn/reghao/tnb/account/app/config/web/AccountInterceptor.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.account.app.config.web;
 
 import cn.reghao.tnb.account.app.security.form.AccountAuthToken;
 import cn.reghao.tnb.account.app.service.AccountTokenService;
-import cn.reghao.jutil.web.ServletUtil;
+import cn.reghao.tnb.common.web.ServletUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Component;

account/account-service/src/main/java/cn/reghao/tnb/account/app/controller/AccountAuthController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.account.app.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import cn.reghao.tnb.account.app.model.vo.AccountToken;
 import cn.reghao.tnb.account.app.service.AccountTokenService;

account/account-service/src/main/java/cn/reghao/tnb/account/app/controller/AccountCodeController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.account.app.controller;
 
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.account.app.model.dto.VerifyCodeDto;
 import cn.reghao.tnb.account.api.dto.RsaPubkey;
 import cn.reghao.tnb.account.app.service.CodeService;

account/account-service/src/main/java/cn/reghao/tnb/account/app/controller/AccountOAuthController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.account.app.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.account.app.model.dto.OAuthAppDto;
 import cn.reghao.tnb.account.app.model.po.oauth.ClientDetails;
 import cn.reghao.tnb.account.app.service.OAuthAppService;

account/account-service/src/main/java/cn/reghao/tnb/account/app/controller/AccountProfileController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.account.app.controller;
 
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.account.app.model.dto.PasswordUpdateDto;
 import cn.reghao.tnb.account.app.model.dto.UserEmailUpdate;
 import cn.reghao.tnb.account.app.service.AccountProfileService;

account/account-service/src/main/java/cn/reghao/tnb/account/app/controller/AccountRecordController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.account.app.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.account.app.model.vo.LoginRecordVo;
 import cn.reghao.tnb.account.app.security.form.AccountAuthToken;
 import cn.reghao.tnb.account.app.service.AccountTokenService;

account/account-service/src/main/java/cn/reghao/tnb/account/app/controller/AccountRegistryController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.account.app.controller;
 
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.account.app.model.dto.AccountRegisterDto;
 import cn.reghao.tnb.account.app.model.dto.PasswordResetDto;
 import cn.reghao.tnb.account.app.model.po.UserRegistry;

account/account-service/src/main/java/cn/reghao/tnb/account/app/controller/AccountResourceController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.account.app.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.util.StringRegexp;
 import cn.reghao.tnb.account.api.dto.AccountInfo;
 import cn.reghao.tnb.account.api.dto.OAuthAccountInfo;

account/account-service/src/main/java/cn/reghao/tnb/account/app/controller/AdminAccountController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.account.app.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.account.api.dto.AccountRegistry;
 import cn.reghao.tnb.account.api.dto.AccountRegistryStatus;
 import cn.reghao.tnb.account.api.iface.AdminAccountService;

account/account-service/src/main/java/cn/reghao/tnb/account/app/redis/RedisKeys.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.account.app.redis;
 
-import cn.reghao.jutil.web.ServletUtil;
+import cn.reghao.tnb.common.web.ServletUtil;
 
 /**
  * @author reghao

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/MyAuthenticationEntryPoint.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.account.app.security;
 
-import cn.reghao.jutil.web.WebResult;
-import cn.reghao.jutil.web.ServletUtil;
+import cn.reghao.tnb.common.web.WebResult;
+import cn.reghao.tnb.common.web.ServletUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/form/AccountAuthFilter.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.account.app.security.form;
 
 import cn.reghao.tnb.account.app.model.dto.AccountLoginDto;
 import cn.reghao.tnb.account.app.service.AccountLoginService;
-import cn.reghao.jutil.web.ServletUtil;
+import cn.reghao.tnb.common.web.ServletUtil;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/form/ThirdPartyAuthFilter.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.account.app.security.form;
 
-import cn.reghao.jutil.web.ServletUtil;
+import cn.reghao.tnb.common.web.ServletUtil;
 import cn.reghao.tnb.account.app.model.constant.LoginPlat;
 import cn.reghao.tnb.account.app.model.constant.LoginType;
 import org.springframework.security.authentication.DisabledException;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/handler/AuthFailureHandlerImpl.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.account.app.security.handler;
 
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.account.app.security.exception.AccountLoginException;
 import cn.reghao.tnb.account.app.service.LoginAttemptService;
 import org.springframework.security.core.AuthenticationException;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/handler/AuthSuccessHandlerImpl.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.account.app.security.handler;
 
-import cn.reghao.jutil.web.WebResult;
-import cn.reghao.jutil.web.ServletUtil;
+import cn.reghao.tnb.common.web.WebResult;
+import cn.reghao.tnb.common.web.ServletUtil;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.account.app.db.repository.AccountRepository;
 import cn.reghao.tnb.account.app.model.constant.LoginPlat;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/handler/LogoutSuccessHandlerImpl.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.account.app.security.handler;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
 import org.springframework.stereotype.Component;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/session/MySecurityContextRepository.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.account.app.security.session;
 
-import cn.reghao.jutil.web.ServletUtil;
+import cn.reghao.tnb.common.web.ServletUtil;
 import cn.reghao.tnb.account.api.constant.TokenType;
 import cn.reghao.tnb.account.app.security.form.AccountAuthToken;
 import cn.reghao.tnb.account.app.service.AccountTokenService;

account/account-service/src/main/java/cn/reghao/tnb/account/app/service/impl/AccountTokenServiceImpl.java

@@ -8,7 +8,7 @@ import cn.reghao.tnb.account.app.model.constant.LoginPlat;
 import cn.reghao.tnb.account.app.model.po.UserLogin;
 import cn.reghao.tnb.account.app.service.AccountTokenService;
 import cn.reghao.tnb.account.app.redis.ds.RedisOps;
-import cn.reghao.jutil.web.ServletUtil;
+import cn.reghao.tnb.common.web.ServletUtil;
 import cn.reghao.tnb.account.app.model.vo.AccountToken;
 import cn.reghao.tnb.account.app.security.form.AccountAuthToken;
 import cn.reghao.tnb.account.app.service.PubkeyService;

account/account-service/src/main/java/cn/reghao/tnb/account/app/service/impl/LoginAttemptServiceImpl.java

@@ -8,7 +8,7 @@ import cn.reghao.tnb.account.app.model.vo.LoginRecordVo;
 import cn.reghao.tnb.account.app.redis.ds.RedisOps;
 import cn.reghao.tnb.account.app.security.form.AccountAuthToken;
 import cn.reghao.tnb.account.app.redis.RedisKeys;
-import cn.reghao.jutil.web.ServletUtil;
+import cn.reghao.tnb.common.web.ServletUtil;
 import cn.reghao.tnb.account.app.db.mapper.UserLoginMapper;
 import cn.reghao.tnb.account.app.model.po.UserLogin;
 import cn.reghao.tnb.account.app.redis.ds.RedisString;

common/pom.xml

@@ -13,12 +13,6 @@
     <version>1.0.0-SNAPSHOT</version>
 
     <dependencies>
-        <dependency>
-            <groupId>cn.reghao.jutil</groupId>
-            <artifactId>web</artifactId>
-            <version>jdk17-SNAPSHOT</version>
-        </dependency>
-
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
@@ -31,13 +25,12 @@
         </dependency>
 
         <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjweaver</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
 
         <dependency>

common/src/main/java/cn/reghao/tnb/common/exception/ControllerExceptionHandler.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.common.exception;
 
 import cn.reghao.jutil.jdk.exception.ExceptionUtil;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpHeaders;

common/src/main/java/cn/reghao/tnb/common/web/ServletUtil.java

@@ -0,0 +1,228 @@
+package cn.reghao.tnb.common.web;
+
+import cn.reghao.jutil.jdk.serializer.JsonConverter;
+import cn.reghao.jutil.jdk.web.log.GatewayLog;
+import cn.reghao.jutil.jdk.http.HeaderNames;
+import org.springframework.util.StringUtils;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author reghao
+ * @date 2021-06-02 13:16:58
+ */
+public class ServletUtil {
+    public static Map<String, String> getCookies() {
+        HttpServletRequest request = getRequest();
+        Cookie[] cookies = request.getCookies();
+        Map<String, String> map = new HashMap<>();
+        if (cookies != null) {
+            for (Cookie cookie : cookies) {
+                String name = cookie.getName();
+                String value = cookie.getValue();
+                map.put(name, value);
+            }
+        }
+        return map;
+    }
+
+    public static String getCookie(String name) {
+        Map<String, String> map = getCookies();
+        return map.get(name);
+    }
+
+    public static Cookie getCookie1(String name, ServletRequest servletRequest) {
+        HttpServletRequest request = (HttpServletRequest) servletRequest;
+        Cookie[] cookies = request.getCookies();
+        if (cookies != null) {
+            for (Cookie cookie : cookies) {
+                String name1 = cookie.getName();
+                if (name1.equals(name)) {
+                    return cookie;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    public static String getCookie(String name, ServletRequest servletRequest) {
+        Map<String, String> map = getCookies(servletRequest);
+        return map.get(name);
+    }
+
+    public static Map<String, String> getCookies(ServletRequest servletRequest) {
+        HttpServletRequest request = (HttpServletRequest) servletRequest;
+        Cookie[] cookies = request.getCookies();
+        Map<String, String> map = new HashMap<>();
+        if (cookies != null) {
+            for (Cookie cookie : cookies) {
+                String name = cookie.getName();
+                String value = cookie.getValue();
+                map.put(name, value);
+            }
+        }
+        return map;
+    }
+
+    public static String getHeader(String key) {
+        return getRequest().getHeader(key);
+    }
+
+    public static String getBearerToken() {
+        String auth = getRequest().getHeader("Authorization");
+        if (auth == null) {
+            return null;
+        }
+        return auth.replace("Bearer ", "");
+    }
+
+    public static String getBearerToken(ServletRequest servletRequest) {
+        HttpServletRequest request = (HttpServletRequest) servletRequest;
+        String auth = request.getHeader("Authorization");
+        if (auth == null) {
+            return null;
+        }
+        return auth.replace("Bearer ", "");
+    }
+
+    @Deprecated
+    public static String getUserId() {
+        String userId = getRequest().getHeader("x-user-id");
+        return  userId != null ? userId : "-1";
+    }
+
+    public static HttpSession getSession() {
+        return getRequest().getSession(false);
+    }
+
+    public static String getBody() throws IOException {
+        HttpServletRequest request = getRequest();
+        StringBuffer sb = new StringBuffer();
+        BufferedReader reader = request.getReader();
+        String line;
+        while ((line = reader.readLine()) != null) {
+            sb.append(line);
+        }
+        return sb.toString();
+    }
+
+    public static Object getBody(HttpServletRequest servletRequest, Class<?> clazz) throws IOException {
+        StringBuilder body = new StringBuilder();
+        BufferedReader reader = servletRequest.getReader();
+        String line;
+        while (null != (line = reader.readLine())) {
+            body.append(line);
+        }
+        reader.close();
+        return JsonConverter.jsonToObject(body.toString(), clazz);
+    }
+
+    public static String getSessionId() {
+        String sessionId = "";
+        HttpSession httpSession = getRequest().getSession();
+        if (httpSession != null) {
+            sessionId = httpSession.getId();
+        }
+
+        return sessionId;
+    }
+
+    /**
+     * 获取 query 参数值
+     *
+     * @param
+     * @return
+     * @date 2021-06-02 下午1:19
+     */
+    public static String getRequestParam(String param, String defaultValue){
+        String parameter = getRequest().getParameter(param);
+        return StringUtils.isEmpty(parameter) ? defaultValue : parameter;
+    }
+
+    public static HttpServletRequest getRequest(){
+        ServletRequestAttributes servletRequestAttributes = getServletRequest();
+        if (servletRequestAttributes != null) {
+            return servletRequestAttributes.getRequest();
+        }
+
+        return null;
+    }
+
+    public static HttpServletResponse getResponse(){
+        ServletRequestAttributes servletRequestAttributes = getServletRequest();
+        if (servletRequestAttributes != null) {
+            return servletRequestAttributes.getResponse();
+        }
+
+        return null;
+    }
+
+    private static ServletRequestAttributes getServletRequest(){
+        RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+        if (requestAttributes instanceof ServletRequestAttributes) {
+            return (ServletRequestAttributes) requestAttributes;
+        }
+
+        return null;
+    }
+
+    public static GatewayLog getGatewayLog() {
+        HttpServletRequest request = ServletUtil.getRequest();
+        return getGatewayLog(request);
+    }
+
+    public static GatewayLog getGatewayLog(HttpServletRequest request) {
+        String remoteAddr = request.getRemoteAddr();
+        int remotePort = request.getRemotePort();
+
+        Map<String, String> requestHeaders = new HashMap<>();
+        Enumeration<String> headerNames = request.getHeaderNames();
+        while (headerNames.hasMoreElements()) {
+            String headerName = headerNames.nextElement();
+            String headerValue = request.getHeader(headerName);
+            requestHeaders.put(headerName, headerValue);
+        }
+
+        String requestId = (String) request.getAttribute(HeaderNames.XRequestId);
+        long requestTime = (Long) request.getAttribute(HeaderNames.XRequestTime);
+        String targetRoute = "";
+        String targetService = "";
+        String requestUrl = request.getRequestURI();
+        String requestMethod = request.getMethod();
+        String requestBody = "";
+
+        int statusCode = getResponse().getStatus();
+        Map<String, String> responseHeaders = new HashMap<>();
+        String responseBody = "";
+        long responseTime = System.currentTimeMillis();
+        long executeTime = responseTime - requestTime;
+
+        String realIP = requestHeaders.get(HeaderNames.XRealIP);
+        if (realIP != null && !realIP.isBlank()) {
+            remoteAddr = realIP;
+        }
+
+        String realRemoteAddr = requestHeaders.get(HeaderNames.XRealRemote);
+        if (realRemoteAddr != null && !realRemoteAddr.isBlank()) {
+            remoteAddr = realRemoteAddr;
+        }
+
+        GatewayLog gatewayLog = new GatewayLog(requestId, requestTime, requestUrl, requestMethod, requestHeaders,
+                remoteAddr, remotePort, statusCode, responseHeaders, responseTime);
+        gatewayLog.setExecuteTime(executeTime);
+        return gatewayLog;
+    }
+}

common/src/main/java/cn/reghao/tnb/common/web/WebResult.java

@@ -0,0 +1,116 @@
+package cn.reghao.tnb.common.web;
+
+import cn.reghao.jutil.jdk.http.HeaderNames;
+import cn.reghao.jutil.jdk.web.result.Result;
+import cn.reghao.jutil.jdk.web.result.ResultStatus;
+import cn.reghao.jutil.jdk.serializer.JsonConverter;
+
+/**
+ * HTTP 响应 body 数据
+ *
+ * @author reghao
+ * @date 2022-01-07 14:05:35
+ */
+public class WebResult<T> {
+    private final int code;
+    private final String msg;
+    private final long timestamp;
+    private final String requestId;
+    private T data;
+
+    private WebResult(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+        this.timestamp = System.currentTimeMillis();
+        this.requestId = ServletUtil.getHeader(HeaderNames.XRequestId);
+    }
+
+    private WebResult(ResultStatus resultStatus) {
+        this.code = resultStatus.getCode();
+        this.msg = resultStatus.getMsg();
+        this.timestamp = System.currentTimeMillis();
+        this.requestId = ServletUtil.getHeader(HeaderNames.XRequestId);
+    }
+
+    private WebResult(String msg) {
+        this.code = ResultStatus.SUCCESS.getCode();
+        this.msg = msg;
+        this.timestamp = System.currentTimeMillis();
+        this.requestId = "";
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public String getRequestId() {
+        return requestId;
+    }
+
+    private void setData(T data) {
+        this.data = data;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public static <T> String result(Result result) {
+        WebResult<T> webBody = new WebResult<>(result.getCode(), result.getMsg());
+        return JsonConverter.objectToJson(webBody);
+    }
+
+    public static <T> String success() {
+        WebResult<T> webBody = new WebResult<>(ResultStatus.SUCCESS.getCode(), ResultStatus.SUCCESS.getMsg());
+        return JsonConverter.objectToJson(webBody);
+    }
+
+    public static <T> String successWithMsg(String msg) {
+        WebResult<T> webBody = new WebResult<>(ResultStatus.SUCCESS.getCode(), msg);
+        return JsonConverter.objectToJson(webBody);
+    }
+
+    public static <T> String success(T data) {
+        WebResult<T> webBody = new WebResult<>(ResultStatus.SUCCESS.getCode(), ResultStatus.SUCCESS.getMsg());
+        webBody.setData(data);
+        return JsonConverter.objectToJson(webBody);
+    }
+
+    public static <T> String fail() {
+        WebResult<T> webBody = new WebResult<>(ResultStatus.FAIL.getCode(), ResultStatus.FAIL.getMsg());
+        return JsonConverter.objectToJson(webBody);
+    }
+
+    public static <T> String failWithMsg(String msg) {
+        WebResult<T> webBody = new WebResult<>(ResultStatus.FAIL.getCode(), msg);
+        return JsonConverter.objectToJson(webBody);
+    }
+
+    public static <T> String notFound() {
+        WebResult<T> webBody = new WebResult<>(ResultStatus.NOTFOUND);
+        return JsonConverter.objectToJson(webBody);
+    }
+
+    public static <T> String error() {
+        WebResult<T> webBody = new WebResult<>(ResultStatus.ERROR.getCode(), ResultStatus.ERROR.getMsg());
+        return JsonConverter.objectToJson(webBody);
+    }
+
+    public static <T> String errorWithMsg(String msg) {
+        WebResult<T> webBody = new WebResult<>(ResultStatus.ERROR.getCode(), msg);
+        return JsonConverter.objectToJson(webBody);
+    }
+
+    public static <T> String fallback(String msg) {
+        WebResult<T> webBody = new WebResult<>(msg);
+        return JsonConverter.objectToJson(webBody);
+    }
+}

content/content-service/src/main/java/cn/reghao/tnb/content/app/aop/TimeConsumedAspect.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.aop;
 
-import cn.reghao.jutil.web.ServletUtil;
+import cn.reghao.tnb.common.web.ServletUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.*;

content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/controller/ChatDialogController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.chat.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.content.app.chat.model.dto.chat.*;
 import cn.reghao.tnb.content.app.chat.service.ChatDialogService;
 import io.swagger.v3.oas.annotations.Operation;

content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/controller/ChatMessageController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.chat.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.content.app.chat.model.dto.chat.ChatRecordDelete;
 import cn.reghao.tnb.content.app.chat.model.dto.chat.ChatRecordRevoke;
 import cn.reghao.tnb.content.app.chat.model.dto.message.*;

content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/controller/ChatMsgController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.chat.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.content.app.chat.model.dto.message.*;
 import cn.reghao.tnb.content.app.chat.service.ChatMessageService;
 import io.swagger.v3.oas.annotations.Operation;

content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/controller/ChatRecordController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.chat.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.content.app.chat.model.dto.chat.ChatRecordGet;
 import cn.reghao.tnb.content.app.chat.model.dto.chat.ChatRecordGetRetList;
 import cn.reghao.tnb.content.app.chat.service.ChatRecordService;

content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/controller/EmoticonController.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.chat.controller;
 
 import cn.reghao.tnb.content.app.chat.model.dto.emoticon.EmoticonInfo;
 import cn.reghao.tnb.content.app.chat.model.dto.emoticon.EmoticonList;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;

content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/controller/GroupController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.chat.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.content.app.chat.model.dto.contact.ContactInfo;
 import cn.reghao.tnb.content.app.chat.model.dto.group.*;
 import cn.reghao.tnb.content.app.chat.service.GroupInfoService;

content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/controller/HongbaoController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.chat.controller;
 
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.content.app.chat.model.dto.HongbaoDto;
 import cn.reghao.tnb.content.app.chat.service.HongbaoService;
 import org.springframework.http.MediaType;

content/content-service/src/main/java/cn/reghao/tnb/content/app/config/web/TokenFilter.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.config.web;
 
-import cn.reghao.jutil.web.ServletUtil;
+import cn.reghao.tnb.common.web.ServletUtil;
 import cn.reghao.tnb.common.auth.LoginUser;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.common.util.ConstantId;

content/content-service/src/main/java/cn/reghao/tnb/content/app/config/web/UserRoleInterceptor.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.config.web;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AccountRole;
 import cn.reghao.tnb.common.auth.UserContext;
 import lombok.extern.slf4j.Slf4j;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/controller/ArticleController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.data.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.app.data.model.dto.ArticlePublishSbt;
 import cn.reghao.tnb.content.app.data.model.po.ArticlePost;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/controller/ArticlePostController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.data.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.app.data.model.dto.ArticlePublishSbt;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/controller/AudioController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.data.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.content.app.data.model.vo.AudioInfo;
 import cn.reghao.tnb.content.app.data.model.vo.UserAudioCard;
 import cn.reghao.tnb.content.app.data.service.AudioService;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/controller/AudioPostController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.data.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.content.app.data.model.dto.AudioPublishSbt;
 import cn.reghao.tnb.content.app.data.model.dto.AudioScopeUpdate;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/controller/ChartController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.data.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.content.app.data.service.ChartService;
 import cn.reghao.tnb.content.app.exam.model.chart.LineChartData;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/controller/CommentController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.data.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.content.api.dto.comment.CommentSbtDto;
 import cn.reghao.tnb.content.api.dto.comment.UserReply;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/controller/DanmakuController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.data.controller;
 
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.content.api.dto.DanmakuSbtDto;
 import cn.reghao.tnb.content.app.data.service.DanmakuService;
 import io.swagger.v3.oas.annotations.tags.Tag;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/controller/ImagePostController.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.data.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.api.dto.ImagePublishSbt;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/controller/ImageQueryController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.data.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.content.app.data.model.vo.AlbumCard;
 import cn.reghao.tnb.content.app.data.service.ImagePostService;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/controller/NewsPostController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.data.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.content.app.data.model.vo.NewsPost;
 import cn.reghao.tnb.content.app.data.service.NewsPostService;
 import io.swagger.v3.oas.annotations.Operation;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/controller/VoteController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.data.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.content.app.data.model.dto.VoteDto;
 import cn.reghao.tnb.content.app.data.model.dto.VoteProgressDto;
 import cn.reghao.tnb.content.app.data.model.po.Vote;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/service/ImagePostService.java

@@ -4,7 +4,7 @@ import cn.reghao.file.api.iface.OssService;
 import cn.reghao.jutil.jdk.web.db.Page;
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.oss.api.dto.media.ImageInfo;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.UserContext;

content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/controller/ExamController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.exam.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AccountRole;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.app.exam.model.constant.PaperViewType;

content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/controller/ExamResultController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.exam.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.app.exam.model.constant.PaperViewType;
 import cn.reghao.tnb.content.app.exam.model.po.PaperResult;

content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/controller/MarkController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.exam.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.app.exam.model.constant.PaperViewType;
 import cn.reghao.tnb.content.app.exam.model.dto.UserResult;

content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/controller/PaperController.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.exam.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.common.db.KeyValue;
 import cn.reghao.tnb.content.app.exam.model.dto.PaperAddDto;

content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/controller/QuestionController.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.exam.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.db.KeyValue;
 import cn.reghao.tnb.content.app.exam.model.dto.QuestionAddDto;
 import cn.reghao.tnb.content.app.exam.model.query.QuestionQuery;

content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/controller/SubjectController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.exam.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.db.KeyValue;
 import cn.reghao.tnb.content.app.exam.model.vo.SubjectInfo;
 import cn.reghao.tnb.content.app.exam.service.SubjectService;

content/content-service/src/main/java/cn/reghao/tnb/content/app/geo/controller/ChartMapController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.geo.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.content.app.geo.model.vo.ChartMap;
 import cn.reghao.tnb.common.db.SelectOption;
 import cn.reghao.tnb.content.app.geo.service.ChartMapService;

content/content-service/src/main/java/cn/reghao/tnb/content/app/geo/controller/MapController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.geo.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.content.app.geo.model.vo.CascadeOption;
 import cn.reghao.tnb.content.app.geo.model.vo.MapMarker;

content/content-service/src/main/java/cn/reghao/tnb/content/app/geo/controller/PhotoMapController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.geo.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.common.db.SelectOption;
 import cn.reghao.tnb.content.api.dto.geo.MallReplyDto;

content/content-service/src/main/java/cn/reghao/tnb/content/app/geo/service/EarthService.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.geo.service;
 
-import cn.reghao.jutil.web.ServletUtil;
+import cn.reghao.tnb.common.web.ServletUtil;
 import cn.reghao.tnb.content.app.geo.model.vo.MapMarker;
 import org.dom4j.Document;
 import org.dom4j.Element;

content/content-service/src/main/java/cn/reghao/tnb/content/app/mall/controller/CartController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.mall.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.app.mall.model.dto.CartDto;

content/content-service/src/main/java/cn/reghao/tnb/content/app/mall/controller/DeliveryController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.mall.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.app.mall.model.po.Delivery;

content/content-service/src/main/java/cn/reghao/tnb/content/app/mall/controller/LogisticsController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.mall.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.app.mall.model.po.Logistics;

content/content-service/src/main/java/cn/reghao/tnb/content/app/mall/controller/ProductController.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.mall.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.content.api.dto.TaobaoItem;
 import cn.reghao.tnb.content.app.mall.model.dto.BuyProductDto;
 import cn.reghao.tnb.content.app.mall.model.dto.ProductAddDto;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/AdminVodController.java

@@ -2,8 +2,8 @@ package cn.reghao.tnb.content.app.vod.controller;
 
 import cn.reghao.file.api.dto.JobInfo;
 import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.jutil.web.ServletUtil;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.ServletUtil;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.account.api.dto.AccountRegistry;
 import cn.reghao.tnb.account.api.iface.AdminAccountService;
 import cn.reghao.tnb.content.api.dto.UserVideoPost;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/AlbumPostController.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.vod.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.app.vod.model.dto.*;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/AlbumQueryController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.vod.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.content.app.vod.model.po.PostAlbum;
 import cn.reghao.tnb.content.app.vod.model.vo.AlbumInfo;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/CategoryController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.vod.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.api.dto.VideoRegion;
 import cn.reghao.tnb.content.app.vod.service.CategoryService;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/ContentController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.vod.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.content.app.vod.model.vo.UserContentData;
 import cn.reghao.tnb.content.app.vod.service.AdminVodService;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/CrawledDataController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.vod.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.content.api.dto.comment.CommentSbtDto;
 import cn.reghao.tnb.content.api.dto.spider.CrawledVideo;
 import cn.reghao.tnb.content.app.vod.service.CrawledDataService;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/RecommendController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.vod.controller;
 
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.api.dto.VideoCard;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/SearchController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.vod.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.content.app.vod.model.vo.HotSearch;
 import cn.reghao.tnb.content.app.vod.model.vo.SuggestKeyword;
 import cn.reghao.tnb.content.api.dto.VideoCard;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/VideoController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.vod.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.content.app.vod.model.vo.DownloadUrl;
 import cn.reghao.tnb.content.app.vod.service.VideoService;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/VideoEditController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.vod.controller;
 
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.content.app.vod.model.dto.VideoErrorReport;
 import cn.reghao.tnb.content.app.vod.service.VideoEditService;
 import io.swagger.v3.oas.annotations.Operation;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/VideoPlayController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.vod.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.common.db.PageScroll;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/VideoPostController.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.vod.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.content.api.dto.VideoFilePublish;
 import cn.reghao.tnb.content.api.dto.VideoFileUpdate;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/VideoQueryController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.vod.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.common.auth.UserContext;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/AlbumService.java

@@ -4,7 +4,7 @@ import cn.reghao.file.api.iface.OssService;
 import cn.reghao.jutil.jdk.web.db.Page;
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.jutil.jdk.string.SnowFlake;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.UserContext;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/VideoQueryService.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.vod.service;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.db.PageScroll;
 import cn.reghao.tnb.content.api.dto.VideoCard;
 import cn.reghao.tnb.content.api.dto.VideoPostCard;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/impl/RecommendServiceImpl.java

@@ -1,8 +1,8 @@
 package cn.reghao.tnb.content.app.vod.service.impl;
 
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.ServletUtil;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.ServletUtil;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.common.db.PageScroll;
 import cn.reghao.tnb.content.api.constant.RcmdMode;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/impl/VideoPostQueryImpl.java

@@ -3,7 +3,7 @@ package cn.reghao.tnb.content.app.vod.service.impl;
 import cn.reghao.file.api.iface.OssService;
 import cn.reghao.jutil.jdk.web.db.Page;
 import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.oss.api.dto.media.VideoInfo;
 import cn.reghao.tnb.oss.api.dto.media.VideoUrlDto;
 import cn.reghao.tnb.account.api.iface.AccountQuery;

file/file-service/pom.xml

@@ -50,10 +50,6 @@
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

file/file-service/src/main/java/cn/reghao/tnb/file/app/config/web/OssSdkInterceptor.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.file.app.config.web;
 
 import cn.reghao.jutil.jdk.http.HeaderNames;
-import cn.reghao.jutil.web.ServletUtil;
+import cn.reghao.tnb.common.web.ServletUtil;
 import cn.reghao.tnb.common.auth.LoginUser;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.file.app.service.UserKeyService;

file/file-service/src/main/java/cn/reghao/tnb/file/app/config/web/TokenFilter.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.file.app.config.web;
 
-import cn.reghao.jutil.web.ServletUtil;
+import cn.reghao.tnb.common.web.ServletUtil;
 import cn.reghao.tnb.common.auth.LoginUser;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.common.util.ConstantId;

file/file-service/src/main/java/cn/reghao/tnb/file/app/controller/AdminFileController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.file.app.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.http.MediaType;

file/file-service/src/main/java/cn/reghao/tnb/file/app/controller/AvatarController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.file.app.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.file.app.model.dto.AvatarUpdate;
 import cn.reghao.tnb.file.app.service.AvatarService;
 import io.swagger.v3.oas.annotations.tags.Tag;

file/file-service/src/main/java/cn/reghao/tnb/file/app/controller/FileOssController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.file.app.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.oss.api.dto.ServerInfo;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.file.api.constant.UploadChannelType;

file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/controller/CamController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.file.app.zdisk.controller;
 
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.file.app.zdisk.model.dto.CamDeviceDto;
 import cn.reghao.tnb.file.app.zdisk.model.dto.CamRecordDto;

file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/controller/DiskAlbumController.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.file.app.zdisk.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.common.db.SelectOption;
 import cn.reghao.tnb.file.app.zdisk.model.dto.AlbumEdit;

file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/controller/DiskFileController.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.file.app.zdisk.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.file.app.zdisk.model.dto.*;

file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/controller/DiskFolderController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.file.app.zdisk.controller;
 
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.file.app.zdisk.model.dto.CreateFolder;
 import cn.reghao.tnb.file.app.zdisk.model.dto.RenameFile;

file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/controller/DiskShareController.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.file.app.zdisk.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.account.api.dto.AccountAvatar;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.file.app.zdisk.model.dto.ShareCreate;

file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/controller/DiskSyncController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.file.app.zdisk.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.file.app.zdisk.model.dto.SyncedFile;
 import cn.reghao.tnb.file.app.zdisk.service.DiskSyncService;

file/file-service/src/main/java/cn/reghao/tnb/file/app/zorder/controller/OrderController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.file.app.zorder.controller;
 
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.file.app.zorder.model.vo.OrderDetail;
 import cn.reghao.tnb.file.app.zorder.service.OrderService;

file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/controller/OssSdkController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.file.app.zoss.controller;
 
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.oss.api.iface.ConsoleService;
 import cn.reghao.tnb.oss.api.dto.ObjectInfo;
 import cn.reghao.tnb.oss.api.dto.ServerInfo;

file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/controller/StoreNodeController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.file.app.zoss.controller;
 
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.db.SelectOption;
 import cn.reghao.tnb.file.app.zoss.model.po.StoreVolume;
 import cn.reghao.tnb.file.app.zoss.model.vo.StoreNodeInfo;

file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/controller/StoreObjectController.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.file.app.zoss.controller;
 
 import cn.reghao.file.api.iface.FileService;
 import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.oss.api.iface.ConsoleService;
 import cn.reghao.tnb.oss.api.dto.ObjectInfo;
 import cn.reghao.tnb.oss.api.dto.ServerInfo;

file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/controller/UploadChannelController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.file.app.zoss.controller;
 
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.oss.api.constant.ObjectSize;
 import cn.reghao.tnb.oss.api.constant.ObjectScope;
 import cn.reghao.tnb.oss.api.constant.ObjectType;

file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/controller/UserKeyController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.file.app.zoss.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.file.app.zoss.model.po.UserKey;
 import cn.reghao.tnb.file.app.service.StoreConfigService;
 import cn.reghao.tnb.file.app.service.UserKeyService;

file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/controller/UserNodeController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.file.app.zoss.controller;
 
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.file.app.zoss.model.dto.NodeAddDto;
 import cn.reghao.tnb.common.db.SelectOption;

message/message-service/pom.xml

@@ -34,10 +34,6 @@
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

message/message-service/src/main/java/cn/reghao/tnb/message/app/controller/AdminMessageController.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.message.app.controller;
 
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.message.app.model.po.EmailAccount;
 import cn.reghao.tnb.message.app.model.po.Webhook;
 import cn.reghao.tnb.message.app.service.EmailAccountService;

message/message-service/src/main/java/cn/reghao/tnb/message/app/controller/UserMessageController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.message.app.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.message.app.model.po.UserMessage;
 import cn.reghao.tnb.message.app.service.UserMessageService;

message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/controller/TnbGatewayController.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.message.app.soa.controller;
 
-import cn.reghao.jutil.web.WebResult;
+import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.message.app.soa.model.vo.RouteDefinitionInfo;
 import cn.reghao.tnb.message.app.soa.service.RouteService;
 import io.swagger.v3.oas.annotations.Operation;