1

pom.xml

@@ -21,12 +21,6 @@
 
         <dependency>
             <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-common-utils</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-fyun-oss</artifactId>
             <version>3.0.0-SNAPSHOT</version>
         </dependency>
@@ -103,11 +97,6 @@
             <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-common-web</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

src/main/java/com/fdkankan/ucenter/common/RequestBase.java

@@ -0,0 +1,23 @@
+package com.fdkankan.ucenter.common;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class RequestBase implements Serializable {
+
+    private int pageNum = 1;
+
+    private int pageSize = 10;
+
+    private int start;
+
+    private String orderBy = "id";
+
+    /**
+     * DESC-降序
+     * ASC-升序
+     */
+    private String sortBy = "DESC";
+}

src/main/java/com/fdkankan/ucenter/common/ResultData.java

@@ -0,0 +1,69 @@
+package com.fdkankan.ucenter.common;
+
+import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.constant.ServerCode;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Calendar;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ResultData<T> implements Serializable {
+    /**
+     * 状态码
+     */
+    private int code;
+    /**
+     * 响应信息
+     */
+    private String message;
+    /**
+     * 后端返回结果
+     */
+    private T data;
+    /**
+     * 后端返回结果
+     */
+    private Boolean success;
+    /**
+     * 响应时间戳
+     */
+    private long timestamp = Calendar.getInstance().getTimeInMillis();
+
+    public static ResultData ok() {
+        return ok(null);
+    }
+    public static ResultData ok(Object data) {
+        return ok("成功", data);
+    }
+    public static ResultData ok(String msg, Object data) {
+        return base(ServerCode.SUCCESS.code(), msg, data,true);
+    }
+
+    public static ResultData error(int code, String msg) {
+        return error(code, msg, null); }
+    public static ResultData error(int code, String msg, Object data) {
+        return base(code, msg, data,false);
+    }
+    public static ResultData error(ErrorCode errorCode, Object data) {
+        return base(errorCode.code(), errorCode.message(), data,false);
+    }
+
+    public static ResultData error(ErrorCode errorCode) {
+        return error(errorCode.code(), errorCode.message());
+    }
+
+    private static ResultData  base(int code, String msg, Object data,Boolean success) {
+        ResultData rd = new ResultData();
+        rd.setCode(code);
+        rd.setMessage(msg);
+        rd.setData(data);
+        rd.setSuccess(success);
+        return rd;
+    }
+
+}

src/main/java/com/fdkankan/ucenter/common/SpringUtil.java

@@ -0,0 +1,65 @@
+package com.fdkankan.ucenter.common;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 实现ApplicationContextAware接口，并加入Component注解，让spring扫描到该bean
+ * 该类用于在普通Java类中注入bean,普通Java类中用@Autowired是无法注入bean的
+ */
+@Component
+public class SpringUtil implements ApplicationContextAware {
+    private static ApplicationContext applicationContext;
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        if(SpringUtil.applicationContext == null) {
+            SpringUtil.applicationContext = applicationContext;
+        }
+    }
+
+    /**
+     * 获取applicationContext
+     */
+    public static ApplicationContext getApplicationContext() {
+        return applicationContext;
+    }
+
+    /**
+     *通过name获取 Bean.
+     * @param name
+     * @return
+     */
+    public static Object getBean(String name){
+        return getApplicationContext().getBean(name);
+    }
+
+    /**
+     * 通过class获取Bean.
+     * @param clazz
+     * @param <T>
+     * @return
+     */
+    public static <T> T getBean(Class<T> clazz){
+        return getApplicationContext().getBean(clazz);
+    }
+
+    /**
+     * 通过name,以及Clazz返回指定的Bean
+     * @param name
+     * @param clazz
+     * @param <T>
+     * @return
+     */
+    public static <T> T getBean(String name,Class<T> clazz){
+        return getApplicationContext().getBean(name, clazz);
+    }
+
+    public <T> Map<String, T> getBeansOfType(Class<T> clazz) {
+        return applicationContext.getBeansOfType(clazz);
+    }
+}

src/main/java/com/fdkankan/ucenter/config/OriginFilter.java

@@ -1,53 +0,0 @@
-package com.fdkankan.ucenter.config;
-
-import org.springframework.boot.web.servlet.ServletComponentScan;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.*;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-
-@Component("originFilter")
-@ServletComponentScan
-@WebFilter(urlPatterns = "/*", filterName = "shiroLoginFilter")
-public class OriginFilter implements Filter {
-
-	private FilterConfig config = null;
-
-	@Override
-	public void init(FilterConfig config) throws ServletException {
-		this.config = config;
-	}
-
-	@Override
-	public void destroy() {
-		this.config = null;
-	}
-
-	@Override
-	public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
-		HttpServletResponse response = (HttpServletResponse) servletResponse;
-		HttpServletRequest request = (HttpServletRequest) servletRequest;
-		//指定允许其他域名访问
-		response.setHeader("Access-Control-Allow-Origin", "*");
-		// 允许请求的方法
-		response.setHeader("Access-Control-Allow-Methods", "POST,GET,OPTIONS,DELETE,PUT");
-		// 多少秒内，不需要再发送预检验请求，可以缓存该结果
-		response.setHeader("Access-Control-Max-Age", "3600");
-		// 表明它允许跨域请求包含xxx头
-		response.setHeader("Access-Control-Allow-Headers",
-				"Origin, No-Cache, X-Requested-With, If-Modified-Since, Pragma, Last-Modified, Cache-Control, Expires,userAgent,User-Agent,version, " +
-				" Content-Type, content-type,X-E4M-With,Authorization,token,authorization");
-		response.setHeader("Access-Control-Allow-Credentials", "true");
-		if (request.getMethod().equals("OPTIONS")) {
-			response.setStatus(200);
-			response.getWriter().write("OPTIONS returns OK");
-			return;
-		}
-		filterChain.doFilter(servletRequest, response);
-	}
-}
-

src/main/java/com/fdkankan/ucenter/config/WebAppConfig.java

@@ -18,11 +18,6 @@ public class WebAppConfig implements WebMvcConfigurer {
 	@Autowired
 	AppInterceptor appInterceptor;
 
-	@Override
-	public void addCorsMappings(CorsRegistry registry) {
-		registry.addMapping("/**").allowCredentials(true).allowedHeaders("*").allowedOrigins("*").allowedMethods("*");
-
-	}
 
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {

src/main/java/com/fdkankan/ucenter/controller/CustomResponseAdvice.java

@@ -4,7 +4,7 @@ package com.fdkankan.ucenter.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.ucenter.common.PageInfo;
-import com.fdkankan.web.response.ResultData;
+import com.fdkankan.ucenter.common.ResultData;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;

src/main/java/com/fdkankan/ucenter/controller/SceneApplyController.java

@@ -7,7 +7,7 @@ import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.ucenter.entity.SceneApply;
 import com.fdkankan.ucenter.service.ISceneApplyService;
-import com.fdkankan.web.response.ResultData;
+import com.fdkankan.ucenter.common.ResultData;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

src/main/java/com/fdkankan/ucenter/pay/factory/PayFactory.java

@@ -2,7 +2,7 @@ package com.fdkankan.ucenter.pay.factory;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.ucenter.vo.request.PlaceOrderParam;
-import com.fdkankan.web.util.SpringUtil;
+import com.fdkankan.ucenter.common.SpringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/fdkankan/ucenter/pay/strategy/OrderStrategyFactory.java

@@ -1,7 +1,7 @@
 package com.fdkankan.ucenter.pay.strategy;
 
 import com.fdkankan.ucenter.vo.response.OrderItemVo;
-import com.fdkankan.web.util.SpringUtil;
+import com.fdkankan.ucenter.common.SpringUtil;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import lombok.extern.log4j.Log4j2;

src/main/java/com/fdkankan/ucenter/service/impl/InnerServiceImpl.java

@@ -15,7 +15,6 @@ import com.fdkankan.ucenter.service.IInnerService;
 import com.fdkankan.ucenter.service.IScenePlusService;
 import com.fdkankan.ucenter.service.ISceneProService;
 import com.fdkankan.ucenter.service.IUserService;
-import com.fdkankan.web.util.WebUtil;
 import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -322,7 +322,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         User user = userService.getByUserName(username);
         param.setSourceList(getSceneSource(param.getSceneSource()));
         param.setUserId(user.getId());
-        param.setStart( (param.getPageNum() -1 ) * param.getPageSize());
         Page<SceneVo> sceneVoPage = getBaseMapper().pageListAndFolder(new Page<>(param.getPageNum(),param.getPageSize()),param);
 
         List<SceneVo> folderList = sceneVoPage.getRecords().parallelStream().filter(entity -> entity.getIsFolder() == 1).collect(Collectors.toList());

src/main/java/com/fdkankan/ucenter/vo/request/AppSceneParam.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.vo.request;
 
-import com.fdkankan.web.request.RequestBase;
+import com.fdkankan.ucenter.common.RequestBase;
 import lombok.Data;
 
 @Data

src/main/java/com/fdkankan/ucenter/vo/request/CameraParam.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.vo.request;
 
-import com.fdkankan.web.request.RequestBase;
+import com.fdkankan.ucenter.common.RequestBase;
 import lombok.Data;
 
 @Data

src/main/java/com/fdkankan/ucenter/vo/request/CartParam.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.vo.request;
 
-import com.fdkankan.web.request.RequestBase;
+import com.fdkankan.ucenter.common.RequestBase;
 import lombok.Data;
 
 @Data

src/main/java/com/fdkankan/ucenter/vo/request/IncrementOrderParam.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.vo.request;
 
-import com.fdkankan.web.request.RequestBase;
+import com.fdkankan.ucenter.common.RequestBase;
 import lombok.Data;
 
 @Data

src/main/java/com/fdkankan/ucenter/vo/request/IncrementParam.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.vo.request;
 
-import com.fdkankan.web.request.RequestBase;
+import com.fdkankan.ucenter.common.RequestBase;
 import lombok.Data;
 
 @Data

src/main/java/com/fdkankan/ucenter/vo/request/InvoiceParam.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.vo.request;
 
-import com.fdkankan.web.request.RequestBase;
+import com.fdkankan.ucenter.common.RequestBase;
 import lombok.Data;
 
 import java.io.Serializable;

src/main/java/com/fdkankan/ucenter/vo/request/OrderParam.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.vo.request;
 
-import com.fdkankan.web.request.RequestBase;
+import com.fdkankan.ucenter.common.RequestBase;
 import lombok.Data;
 
 @Data

src/main/java/com/fdkankan/ucenter/vo/request/SceneParam.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.vo.request;
 
-import com.fdkankan.web.request.RequestBase;
+import com.fdkankan.ucenter.common.RequestBase;
 import lombok.Data;
 
 import java.util.List;

src/main/java/com/fdkankan/ucenter/vo/request/VirtualOrderParam.java

@@ -1,6 +1,6 @@
 package com.fdkankan.ucenter.vo.request;
 
-import com.fdkankan.web.request.RequestBase;
+import com.fdkankan.ucenter.common.RequestBase;
 import lombok.Data;
 
 @Data

src/main/resources/bootstrap-dev.yml

@@ -12,9 +12,6 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
         shared-configs:
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
 
           - data-id: common-redis-config-52.yaml
             group: DEFAULT_GROUP

src/main/resources/bootstrap-pro.yml

@@ -12,9 +12,6 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
         shared-configs:
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
 
           - data-id: common-redis-config-52.yaml
             group: DEFAULT_GROUP

src/main/resources/bootstrap-test.yml

@@ -12,9 +12,6 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
         shared-configs:
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
 
           - data-id: common-redis-config.yaml
             group: DEFAULT_GROUP

src/main/resources/mapper/ucenter/SceneProMapper.xml

@@ -72,7 +72,7 @@
                 AND parent_id is null
             </if>
             order by create_time desc
-            limit #{param.start},#{param.pageSize}
+            limit 1000
             )as tb
             UNION
         </if>