merge

boot-service/src/main/java/com/xwbing/entity/SysAuthority.java

@@ -3,6 +3,7 @@ package com.xwbing.entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 
 /**
@@ -28,7 +29,7 @@ public class SysAuthority extends BaseEntity {
     /**
      * 是否启用
      */
-    private String isEnable;
+    private String enable;
     /**
      * url地址
      */
@@ -36,6 +37,7 @@ public class SysAuthority extends BaseEntity {
     /**
      * 父ID
      */
+    @Column(name = "parent_id")
     private String parentId;
     /**
      * 类型  2按钮 1菜单

boot-service/src/main/java/com/xwbing/entity/SysRole.java

@@ -3,7 +3,6 @@ package com.xwbing.entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
 
 /**
@@ -29,8 +28,7 @@ public class SysRole extends BaseEntity {
     /**
      * 是否启用
      */
-    @Column(name = "is_enable")
-    private String isEnable;
+    private String enable;
     /**
      * 描述
      */

boot-service/src/main/java/com/xwbing/redis/RedisStartupInit.java

@@ -3,11 +3,11 @@ package com.xwbing.redis;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.Iterator;
 import java.util.Set;
 
@@ -21,7 +21,7 @@ import java.util.Set;
 @PropertySource("classpath:redis.properties")//只能读取properties文件
 public class RedisStartupInit implements InitializingBean {
     private final Logger logger = LoggerFactory.getLogger(RedisStartupInit.class);
-    @Autowired
+    @Resource
     private RedisService redisService;
     @Value("${redisCode}")
     private String redisCode;

boot-service/src/main/java/com/xwbing/service/MailService.java

@@ -10,6 +10,7 @@ import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
 import java.io.File;
@@ -22,7 +23,7 @@ import java.io.File;
  */
 @Service
 public class MailService {
-    @Autowired
+    @Resource
     private JavaMailSender mailSender;
     @Value("${spring.mail.username}")
     private String from;

boot-service/src/main/java/com/xwbing/service/SysConfigService.java

@@ -7,9 +7,9 @@ import com.xwbing.util.PassWordUtil;
 import com.xwbing.util.RestMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 
@@ -21,7 +21,7 @@ import java.util.List;
  */
 @Service
 public class SysConfigService {
-    @Autowired
+    @Resource
     private SysConfigRepository sysConfigRepository;
     private static Logger logger = LoggerFactory.getLogger(SysConfigService.class);