Explorar el Código

fix:
修改了一些bug

18339543638 hace 1 año
padre
commit
3607e030bc

+ 7 - 0
nb-admin/pom.xml

@@ -107,6 +107,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure-processor</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-core</artifactId>
+        </dependency>
     </dependencies>
 
 
@@ -130,6 +135,8 @@
                         <layers>
                             <enabled>true</enabled>
                         </layers>
+                        <includeSystemScope>true</includeSystemScope>
+                        <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
                     </configuration>
                     <executions>
                         <execution>

+ 0 - 1
nb-service-api/app-doctor-api/src/main/java/com/nb/app/doctor/api/entity/AppDoctorUserEntity.java

@@ -34,7 +34,6 @@ public class AppDoctorUserEntity extends TenantGenericEntity<String,String> {
 
     @ApiModelProperty(value = "密码,密码不得超过32位")
     @Length(max = 32,message = "密码不得超过32位",groups = {Insert.class,Update.class})
-    @TableField(updateStrategy = FieldStrategy.NEVER)
     @JsonIgnoreProperties(allowSetters = true)
     private String password;
 

+ 6 - 0
nb-service/app-doctor/src/main/java/com/nb/app/doctor/service/LocalAppDoctorUserService.java

@@ -31,6 +31,7 @@ import com.nb.im.service.LocalImRoomService;
 import com.nb.im.utils.ImUtils;
 import com.nb.im.ws.PubMsgInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.hibernate.validator.constraints.Length;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.event.EventListener;
@@ -150,6 +151,11 @@ public class LocalAppDoctorUserService extends BaseService<AppDoctorUserMapper,
         if(sources.size()>100){
             throw new CustomException("单次新增用户数量不可超过100个");
         }
+        for (AppDoctorUserEntity source : sources) {
+             if(StrUtil.isEmpty(source.getRealName())){
+                 throw new CustomException(String.format("用户名:{%s},姓名不能为空",source.getUsername()));
+             }
+        }
         List<String> userNames = sources.stream()
                 .peek(source->{
                     if(StrUtil.isEmpty(source.getPassword())){

+ 1 - 1
nb-service/web-service/src/main/java/com/nb/web/service/bus/mapper/AppArticleMapper.java

@@ -18,7 +18,7 @@ import org.apache.ibatis.annotations.Select;
 @Mapper
 public interface AppArticleMapper extends BaseMapper<AppArticleEntity> {
 
-    @Select("select id,title,type,back_links,\n" +
+    @Select("select id,title,graph,type,back_links,\n" +
             "left(content , 150)  as content,\n" +
             "url,\n" +
             "create_time,create_by,update_time,update_by\n" +