提交

Author: yzcheng90

doc/x_springboot.sql

@@ -23,12 +23,9 @@
 		<hutool.version>5.8.11</hutool.version>
 		<swagger.version>3.0.0</swagger.version>
 
-		<minio.version>6.0.2</minio.version>
 		<velocity.version>1.7</velocity.version>
 		<kaptcha.version>0.0.9</kaptcha.version>
-		<qiniu.version>[7.2.0, 7.2.99]</qiniu.version>
-		<aliyun.oss.version>2.5.0</aliyun.oss.version>
-		<qcloud.cos.version>4.4</qcloud.cos.version>
+		<qiniu.version>7.12.1</qiniu.version>
 		<gson.version>2.8.9</gson.version>
 
 		<commons.fileupload.version>1.3.3</commons.fileupload.version>
@@ -73,7 +70,7 @@
 		<dependency>
 			<groupId>com.github.yzcheng90</groupId>
 			<artifactId>autofull-spring-boot-starter</artifactId>
-			<version>1.3.5</version>
+			<version>1.3.7</version>
 		</dependency>
 
         <!--apk 解析-->
@@ -126,18 +123,6 @@
 			<version>${commons.configuration.version}</version>
 		</dependency>
 
-		<!-- 监控端点-->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
-		</dependency>
-		<!--minio文件系统-->
-		<dependency>
-			<groupId>io.minio</groupId>
-			<artifactId>minio</artifactId>
-			<version>${minio.version}</version>
-		</dependency>
-
 		<!--hutool-->
 		<dependency>
 			<groupId>cn.hutool</groupId>
@@ -157,22 +142,6 @@
 			<artifactId>qiniu-java-sdk</artifactId>
 			<version>${qiniu.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.aliyun.oss</groupId>
-			<artifactId>aliyun-sdk-oss</artifactId>
-			<version>${aliyun.oss.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.qcloud</groupId>
-			<artifactId>cos_api</artifactId>
-			<version>${qcloud.cos.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-log4j12</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 
 		<!--Lombok-->
 		<dependency>

pom.xml

@@ -39,7 +39,7 @@ public UserDetails loadUserByUsername(String username) throws UsernameNotFoundEx
         return getDetail(sysUser);
     }
 
-    public UserDetails loadUserByUserId(Long userId) throws UsernameNotFoundException {
+    public UserDetails loadUserByUserId(String userId) throws UsernameNotFoundException {
         SysUser sysUser = sysUserService.getById(userId);
         if (ObjectUtil.isNull(sysUser)) {
             throw new UsernameNotFoundException("用户不存在");

src/main/java/com/suke/czx/authentication/detail/CustomUserDetailsService.java

@@ -17,9 +17,9 @@
 @EqualsAndHashCode(callSuper = true)
 public class CustomUserDetailsUser extends User implements Serializable {
 
-    private Long userId;
+    private String userId;
 
-    public CustomUserDetailsUser(Long userId,String username, String password, Collection<? extends GrantedAuthority> authorities) {
+    public CustomUserDetailsUser(String userId,String username, String password, Collection<? extends GrantedAuthority> authorities) {
         super(username, password, authorities);
         this.userId = userId;
     }

src/main/java/com/suke/czx/authentication/detail/CustomUserDetailsUser.java

@@ -4,9 +4,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.suke.czx.common.event.LoginLogEvent;
 import com.suke.czx.common.utils.IPUtils;
-import com.suke.czx.common.utils.R;
 import com.suke.czx.common.utils.SpringContextUtils;
 import com.suke.czx.modules.sys.entity.SysLoginLog;
+import com.suke.zhjg.common.autofull.util.R;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;

src/main/java/com/suke/czx/authentication/handler/CustomAuthenticationFailHandler.java

@@ -43,7 +43,7 @@ public class CustomAuthenticationSuccessHandler implements AuthenticationSuccess
     @Override
     public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) {
         String token;
-        Long userId = 0l;
+        String userId = "";
         String userName = "";
         if (authentication.getPrincipal() instanceof CustomUserDetailsUser) {
             CustomUserDetailsUser userDetailsUser = (CustomUserDetailsUser) authentication.getPrincipal();

src/main/java/com/suke/czx/authentication/handler/CustomAuthenticationSuccessHandler.java

@@ -1,7 +1,7 @@
 package com.suke.czx.authentication.handler;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.suke.czx.common.utils.R;
+import com.suke.zhjg.common.autofull.util.R;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.security.core.AuthenticationException;

src/main/java/com/suke/czx/authentication/handler/TokenAuthenticationFailHandler.java

@@ -0,0 +1,15 @@
+package com.suke.czx.common.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 忽略XSS过滤
+ * @author czx
+ * @email [email protected]
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface XssIgnore {
+
+}

src/main/java/com/suke/czx/common/annotation/XssIgnore.java

@@ -29,7 +29,7 @@ protected CustomUserDetailsUser getUser() {
 	}
 
 	@SneakyThrows
-	protected Long getUserId() {
+	protected String getUserId() {
 		return UserUtil.getUserId();
 	}
 }

src/main/java/com/suke/czx/common/base/AbstractController.java

@@ -1,6 +1,6 @@
 package com.suke.czx.common.exception;
 
-import com.suke.czx.common.utils.R;
+import com.suke.zhjg.common.autofull.util.R;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.http.HttpStatus;

src/main/java/com/suke/czx/common/exception/RRExceptionHandler.java

@@ -2,7 +2,7 @@
 
 /**
  * 常量
- * 
+ *
  * @author czx
  * @email [email protected]
  * @date 2016年11月15日 下午1:23:52
@@ -19,13 +19,13 @@ public class Constant {
     public static final int TOKEN_EXPIRE = 60 * 60 * 24 * 7;
 
 	/** 超级管理员ID */
-	public static final int SUPER_ADMIN = 1;
+	public static final String SUPER_ADMIN = "0";
 
 	public static final int CODE_SIZE = 4;
 
 	/**
 	 * 菜单类型
-	 * 
+	 *
 	 * @author czx
 	 * @email [email protected]
 	 * @date 2016年11月15日 下午1:24:29

src/main/java/com/suke/czx/common/utils/Constant.java

@@ -190,12 +190,12 @@ public String getFileName(MakerConfigEntity makerConfig, String template, String
         }
 
         // js
-        if (makerConfig.isFileEntity() && template.contains("index.js.vm")) {
+        if (makerConfig.isGenUi() && template.contains("index.js.vm")) {
             return File.separator + "src" + File.separator + "api" + File.separator + moduleName + File.separator + "index.js";
         }
 
         // vue
-        if (makerConfig.isFileEntity() && template.contains("index.vue.vm")) {
+        if (makerConfig.isGenUi() && template.contains("index.vue.vm")) {
             return File.separator + "src" + File.separator + "views" + File.separator + moduleName + File.separator + "index.vue";
         }
 

src/main/java/com/suke/czx/common/utils/GenUtils.java

@@ -22,7 +22,7 @@ public CustomUserDetailsUser getUser() {
     }
 
     @SneakyThrows
-    public Long getUserId() {
+    public String getUserId() {
         return getUser() == null ? null :getUser().getUserId();
     }
 

src/main/java/com/suke/czx/common/utils/R.java

@@ -1,5 +1,7 @@
 package com.suke.czx.common.xss;
 
+import com.suke.czx.common.utils.SpringContextUtils;
+import com.suke.czx.config.XssIgnoreConfig;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.http.HttpHeaders;
@@ -45,8 +47,13 @@ public ServletInputStream getInputStream() throws IOException {
             return super.getInputStream();
         }
 
+
         //xss过滤
-        json = xssEncode(json);
+        final XssIgnoreConfig xssIgnoreConfig = SpringContextUtils.getBean(XssIgnoreConfig.class);
+        final String requestURI = orgRequest.getRequestURI();
+        if (xssIgnoreConfig == null || !xssIgnoreConfig.isContains(requestURI)) {
+            json = xssEncode(json);
+        }
         final ByteArrayInputStream bis = new ByteArrayInputStream(json.getBytes("utf-8"));
         return new ServletInputStream() {
             @Override