drew 5 tahun lalu
induk
melakukan
9bca4ace04

+ 16 - 0
db.sql

@@ -0,0 +1,16 @@
+INSERT INTO `menu`(`id`, `created_at`, `created_by`, `modified_at`, `modified_by`, `active`, `enabled`, `icon`, `name`, `parent`, `path`, `root`, `sort`) VALUES (2, NULL, '', NULL, '', b'1', b'1', '', '系统菜单', NULL, '', b'1', 1);
+INSERT INTO `menu`(`id`, `created_at`, `created_by`, `modified_at`, `modified_by`, `active`, `enabled`, `icon`, `name`, `parent`, `path`, `root`, `sort`) VALUES (6, NULL, '', NULL, '', b'1', b'1', 'fas fa-user', '用户管理', 2, '/userList', b'0', 2);
+INSERT INTO `menu`(`id`, `created_at`, `created_by`, `modified_at`, `modified_by`, `active`, `enabled`, `icon`, `name`, `parent`, `path`, `root`, `sort`) VALUES (4, NULL, '', NULL, '', b'1', b'1', 'fas fa-code', '代码生成', 3, '/genCodeList', b'0', 5);
+INSERT INTO `menu`(`id`, `created_at`, `created_by`, `modified_at`, `modified_by`, `active`, `enabled`, `icon`, `name`, `parent`, `path`, `root`, `sort`) VALUES (5, NULL, '', NULL, '', b'1', b'1', 'fas fa-bug', '接口调试', 3, '/api', b'0', 6);
+INSERT INTO `menu`(`id`, `created_at`, `created_by`, `modified_at`, `modified_by`, `active`, `enabled`, `icon`, `name`, `parent`, `path`, `root`, `sort`) VALUES (10, NULL, '', NULL, '', b'1', b'1', '', '菜单配置', 9, '/menus', b'0', 7);
+INSERT INTO `menu`(`id`, `created_at`, `created_by`, `modified_at`, `modified_by`, `active`, `enabled`, `icon`, `name`, `parent`, `path`, `root`, `sort`) VALUES (14, NULL, '', NULL, '', b'1', b'1', '', '参数配置', 9, '/sysConfigList', b'0', 8);
+INSERT INTO `menu`(`id`, `created_at`, `created_by`, `modified_at`, `modified_by`, `active`, `enabled`, `icon`, `name`, `parent`, `path`, `root`, `sort`) VALUES (3, NULL, '', NULL, '', b'1', b'1', 'fas fa-desktop', '开发', 2, '', b'0', 4);
+INSERT INTO `menu`(`id`, `created_at`, `created_by`, `modified_at`, `modified_by`, `active`, `enabled`, `icon`, `name`, `parent`, `path`, `root`, `sort`) VALUES (9, NULL, '', NULL, '', b'1', b'1', 'fas fa-cog', '配置', 2, '', b'0', 3);
+
+INSERT INTO `user_authority`(`user_id`, `authority_name`) VALUES (1, 'ROLE_ADMIN');
+INSERT INTO `user_authority`(`user_id`, `authority_name`) VALUES (1, 'ROLE_USER');
+
+INSERT INTO `user`(`id`, `created_at`, `created_by`, `modified_at`, `modified_by`, `avatar`, `city`, `country`, `email`, `enabled`, `language`, `nickname`, `open_id`, `password`, `phone`, `province`, `sex`, `username`) VALUES (1, '2020-03-07 18:34:36', 'system', '2020-03-07 18:34:36', 'system', 'https://zhumj.oss-cn-hangzhou.aliyuncs.com/image/user.jpg', NULL, NULL, NULL, b'1', NULL, '管理员', NULL, '$2a$10$F1djCtmdF3T0qsviWw50/utajZSe4EJMMUD.Ey5BhEIpoDhanBMuC', NULL, NULL, NULL, 'root');
+
+INSERT INTO `user_authority`(`user_id`, `authority_name`) VALUES (1, 'ROLE_ADMIN');
+INSERT INTO `user_authority`(`user_id`, `authority_name`) VALUES (1, 'ROLE_USER');

+ 0 - 20
src/main/java/com/izouma/awesomeAdmin/service/UserService.java

@@ -22,7 +22,6 @@ import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -140,25 +139,6 @@ public class UserService {
         return user;
     }
 
-    @PostConstruct
-    public void init() {
-        User root = userRepo.findByUsername("root");
-        if (root == null) {
-            Set<Authority> authorities = new HashSet<>();
-            authorities.add(new Authority(Authority.NAMES.ROLE_ADMIN.name()));
-            authorities.add(new Authority(Authority.NAMES.ROLE_USER.name()));
-            root = User.builder()
-                    .nickname("管理员")
-                    .username("root")
-                    .password(new BCryptPasswordEncoder().encode("123456"))
-                    .avatar(Constants.DEFAULT_AVATAR)
-                    .enabled(true)
-                    .authorities(authorities)
-                    .build();
-            userRepo.save(root);
-        }
-    }
-
     public String setPassword(Long userId, String password) {
         User user = userRepo.findById(userId).orElseThrow(new BusinessException("用户不存在"));
         user.setPassword(new BCryptPasswordEncoder().encode(password));

+ 2 - 10
src/main/java/com/izouma/awesomeAdmin/web/AuthorityController.java

@@ -2,17 +2,16 @@ package com.izouma.awesomeAdmin.web;
 
 import com.izouma.awesomeAdmin.repo.AuthorityRepo;
 import com.izouma.awesomeAdmin.security.Authority;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.PostConstruct;
 import java.util.List;
 
 @RestController
 @RequestMapping("/authority")
+@AllArgsConstructor
 public class AuthorityController extends BaseController {
-    @Autowired
     private AuthorityRepo authorityRepo;
 
     @PreAuthorize("hasRole('ADMIN')")
@@ -26,11 +25,4 @@ public class AuthorityController extends BaseController {
     public Authority save(Authority authority) {
         return authorityRepo.save(authority);
     }
-
-    @PostConstruct
-    public void init() {
-        authorityRepo.save(new Authority(Authority.NAMES.ROLE_ADMIN.name()));
-        authorityRepo.save(new Authority(Authority.NAMES.ROLE_USER.name()));
-        authorityRepo.save(new Authority(Authority.NAMES.ROLE_DEV.name()));
-    }
 }