Merge branch 'master' of http://112.74.63.148:3000/wuhongshuang/szwlServer

src/main/java/com/szwl/controller/TAdminController.java

@@ -189,6 +189,8 @@ public class TAdminController {
         // 获取拥有的权限菜单
         Set<String> menuList = sysRoleService.listAuthMenuByUserId(userDetailBO.getId());
         userDetailBO.setMenuCodeList(CollUtil.newArrayList(menuList));
+        // 抹除密码
+        userDetailBO.setPassword(null);
         // 保存到redis
         tokenManager.saveAuthentication(token,userDetailBO);
         return R.ok(userDetailBO);

src/main/resources/application.yml

@@ -1,2 +1,8 @@
 swagger:
-  url: /v2/api-docs,/swagger-resources,/swagger-resources/**,/configuration/ui,/configuration/security,/swagger-ui.html/**,/webjars/**,/doc.html,/doc.html/**,/*.html,/**.html,/**/*.html,/**/*.css,/**/*.js,/sys/api/list,/sys/user/batch,/sys/org/batch
+  url: /v2/api-docs,/swagger-resources,/swagger-resources/**,/configuration/ui,/configuration/security,/swagger-ui.html/**,/webjars/**,/doc.html,/doc.html/**,/*.html,/**.html,/**/*.html,/**/*.css,/**/*.js,/sys/api/list,/sys/user/batch,/sys/org/batch
+logging:
+  file:
+    name: /app/applogs/${spring.application.name}/${spring.application.name}.log
+    path: /app/applogs/${spring.application.name}/${spring.application.name}.log
+    max-size: 100MB
+  level: info