Merge remote-tracking branch 'origin/master'

nbjk-admin/src/main/java/com/miaxis/system/controller/common/CommonController.java

@@ -35,6 +35,46 @@ public class CommonController
 {
     private static final Logger log = LoggerFactory.getLogger(CommonController.class);
 
+    /**
+     * 通用下载请求
+     *
+     * @param fileName 文件名称
+     * @param delete 是否删除
+     */
+    @GetMapping("common/download")
+    @ApiOperation("通用下载请求")
+    public void fileDownload(
+            @ApiParam(name = "fileName", value = "文件名称")
+            @RequestParam(name = "fileName", required = true) String fileName,
+            @ApiParam(name = "delete", value = "是否删除")
+            @RequestParam(name = "delete", required = true) Boolean delete,
+            HttpServletResponse response,
+            HttpServletRequest request)
+    {
+        try
+        {
+            if (!FileUtils.isValidFilename(fileName))
+            {
+                throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
+            }
+            String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
+            String filePath = MiaxisConfig.getDownloadPath() + fileName;
+
+            response.setCharacterEncoding("utf-8");
+            response.setContentType("multipart/form-data");
+            response.setHeader("Content-Disposition",
+                    "attachment;fileName=" + FileUtils.setFileDownloadHeader(request, realFileName));
+            FileUtils.writeBytes(filePath, response.getOutputStream());
+            if (delete)
+            {
+                FileUtils.deleteFile(filePath);
+            }
+        }
+        catch (Exception e)
+        {
+            log.error("下载文件失败", e);
+        }
+    }
 
 
     /**

nbjk-framework/src/main/java/com/miaxis/framework/config/SecurityConfig.java

@@ -103,7 +103,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/**/open-api/**","/system/config/configKey/**").permitAll()
                 // 对于登录login 验证码captchaImage 允许匿名访问
                 .antMatchers("/login", "/login/noCode","/captchaImage","/login/code","/login/gzhcode",
-                        "/login/code/test","/login/jscode-test","/login/code/ios","/login/dycode",
+                        "/login/code/test","/login/jscode-test","/login/jscode","/login/code/ios","/login/dycode",
                         "/login/ttcode","/login/ttcodeTest").anonymous()
                 //.antMatchers("/student/open/**").permitAll()
                 .antMatchers("/student/**").hasRole("STUDENT")

nbjk-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where name = #{name}
 	</select>
 	<insert id="saveUserInfo" parameterType="com.miaxis.common.core.domain.entity.UserInfo" >
-		insert into user_info (head_image,nick_name,xcx_openid,app_openid,union_id,third_platform,gzh_openid)
+		insert into user_info (head_image,nick_name,xcx_openid,app_openid,union_id,gzh_openid)
 		values (#{headImage},#{nickName},#{xcxOpenid},#{appOpenid},#{unionId},#{gzhOpenid})
 	</insert>