冲突

common/common-entity/src/main/java/com/yihu/jw/entity/base/role/MenuDO.java

@@ -2,7 +2,6 @@ package com.yihu.jw.entity.base.role;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import java.sql.Timestamp;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -13,7 +12,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_menu")
public class BaseMenuDO extends UuidIdentityEntityWithOperator {
public class MenuDO extends UuidIdentityEntityWithOperator {
	private String saasId;
	/**

common/common-entity/src/main/java/com/yihu/jw/entity/base/role/RoleMenuDO.java

@@ -12,7 +12,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_role_menu")
public class BaseRoleMenuDO extends IntegerIdentityEntity {
public class RoleMenuDO extends IntegerIdentityEntity {
	/**
	 * 角色ID

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/web/MixEnvelop.java

@@ -32,7 +32,7 @@ public class MixEnvelop<T, J> extends Envelop {
    private int currPage = 1;
    @ApiModelProperty(value = "每页大小 默认10", example = "15")
    private int pageSize = 10;
    private int pageSize = 15;
    @ApiModelProperty(value = "总共多少页", example = "2")
    private int totalPage;

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/web/PageEnvelop.java

@@ -32,7 +32,7 @@ public class PageEnvelop<T> extends Envelop implements Serializable {
    private int currPage = 1;
    @ApiModelProperty(value = "每页大小 默认10", example = "15")
    private int pageSize = 10;
    private int pageSize = 15;
    @ApiModelProperty(value = "总共多少页", example = "2")
    private int totalPage;

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/web/endpoint/EnvelopRestEndpoint.java

@@ -161,13 +161,13 @@ public abstract class EnvelopRestEndpoint {
    }
    protected <T, J> MixEnvelop<T, J> success(String message, int status, List<T> contents, J obj) {
        return success(message, status, contents, obj, contents.size(), 1, contents.size());
        return success(message, status, contents, obj, contents.size(), 1, contents.size() != 0 ? contents.size() : 15);
    }
    protected <T, J, _T, _J> MixEnvelop<_T, _J> success(String message, int status, List<T> contents, J obj, Class<_T> targetContents, Class<_J> targetObj) {
        List<_T> _contents = convertToModels(contents, new ArrayList<>(contents.size()), targetContents);
        _J _obj = convertToModel(obj, targetObj);
        return success(message, status, _contents, _obj, _contents.size(), 1, _contents.size());
        return success(message, status, _contents, _obj, _contents.size(), 1, _contents.size() != 0 ? _contents.size() : 15);
    }
    protected <T, J> MixEnvelop<T, J> success(String message, int status, List<T> contents, J obj, int totalCount, int currPage, int pageSize) {

server/svr-configuration/src/main/resources/bootstrap.yml

@@ -38,4 +38,17 @@ spring:
        git:
          uri: ${wlyy.spring.config.git.uri:http://192.168.120.153:3000/jiwei/wlyy2.0.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:prod}
        default-label: ${wlyy.spring.config.git.label:prod}
---
spring:
  profiles: local
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://10.95.22.168:3000/jiwei/wlyy2.0.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:local}

svr/svr-base/src/main/java/com/yihu/jw/base/config/SwaggerDocs.java

@@ -19,10 +19,12 @@ public class SwaggerDocs {
        //1.请求 http://ip:port/swagger-resources获取group
        String group = "Default";
        //2.定义请求地址 new URL("http://ip:port/v2/api-docs?group=" + groupName)
        URL remoteSwaggerFile = new URL("http://127.0.0.1:10020/v2/api-docs?group=" + group); //项目的swagger-ui地址
        //项目的swagger-ui地址
        URL remoteSwaggerFile = new URL("http://127.0.0.1:10020/v2/api-docs?group=" + group);
        //3.定义文件输出路径
        String prefix = Thread.currentThread().getContextClassLoader().getResource("").getPath();
        Path outputFile = Paths.get(prefix.substring(prefix.lastIndexOf(":") + 1, prefix.indexOf("target") - 1) + "/build/" + group); //文档输出地址
        //文档输出地址
        Path outputFile = Paths.get(prefix.substring(prefix.lastIndexOf(":") + 1, prefix.indexOf("target") - 1) + "/build/" + group);
        Swagger2MarkupConfig config = new Swagger2MarkupConfigBuilder()
                .withMarkupLanguage(MarkupLanguage.ASCIIDOC)

svr/svr-base/src/main/java/com/yihu/jw/base/service/sms/SmsGatewayService.java

@@ -60,8 +60,7 @@ public class SmsGatewayService extends BaseJpaService<SmsGatewayDO, SmsGatewayDa
         * 1 - 过期时间（分钟）
         */
        String [] contentDatas = new String[] {
//                randomInt(6), 找不到该方法，先用空字符串替代，此类作者自己再纠正回来
                "",
                randomInt(6),
                smsGatewayDO.getExpireMin().toString()
        };
        Matcher contentMatcher = PATTERN.matcher(rawContent);
@@ -113,9 +112,4 @@ public class SmsGatewayService extends BaseJpaService<SmsGatewayDO, SmsGatewayDa
        }
    }
    public static void main(String [] args) {
        Object obj = 1;
        System.out.println(obj.toString());
    }
}