elink-star
/
esua-epdc-cloud
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

提交用户类别和conf环境占位符

dev
管理员 6 years ago
parent
3c95aca4e6
commit
7407f4dd9b
6 changed files with 179 additions and 123 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 97
      esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java
  2. 141
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysUserEntity.java
  3. 22
      esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml
  4. 11
      esua-epdc/epdc-gateway/pom.xml
  5. 27
      esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
  6. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf

97
esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java
View File

@ -1,8 +1,8 @@
/** /**
* Copyright (c) 2018 人人开源 All rights reserved. * Copyright (c) 2018 人人开源 All rights reserved.
* * <p>
* https://www.renren.io * https://www.renren.io
* * <p>
* 版权所有，侵权必究！ * 版权所有，侵权必究！
*/ */
@ -36,63 +36,68 @@ import java.util.List;
public class SysUserDTO implements Serializable { public class SysUserDTO implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id") @ApiModelProperty(value = "id")
@Null(message="{id.null}", groups = AddGroup.class) @Null(message = "{id.null}", groups = AddGroup.class)
@NotNull(message="{id.require}", groups = UpdateGroup.class) @NotNull(message = "{id.require}", groups = UpdateGroup.class)
private Long id; private Long id;
@ApiModelProperty(value = "用户名", required = true)
@NotBlank(message = "{sysuser.username.require}", groups = DefaultGroup.class)
private String username;
@ApiModelProperty(value = "用户名", required = true) @ApiModelProperty(value = "密码")
@NotBlank(message="{sysuser.username.require}", groups = DefaultGroup.class) @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private String username; @NotBlank(message = "{sysuser.password.require}", groups = AddGroup.class)
private String password;
@ApiModelProperty(value = "密码") @ApiModelProperty(value = "姓名", required = true)
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY) @NotBlank(message = "{sysuser.realname.require}", groups = DefaultGroup.class)
@NotBlank(message="{sysuser.password.require}", groups = AddGroup.class) private String realName;
private String password;
@ApiModelProperty(value = "姓名", required = true) @ApiModelProperty(value = "头像")
@NotBlank(message="{sysuser.realname.require}", groups = DefaultGroup.class) private String headUrl;
private String realName;
@ApiModelProperty(value = "头像") @ApiModelProperty(value = "性别 0：男 1：女 2：保密", required = true)
private String headUrl; @Range(min = 0, max = 2, message = "{sysuser.gender.range}", groups = DefaultGroup.class)
private Integer gender;
@ApiModelProperty(value = "性别 0：男 1：女 2：保密", required = true) @ApiModelProperty(value = "邮箱", required = true)
@Range(min=0, max=2, message = "{sysuser.gender.range}", groups = DefaultGroup.class) @NotBlank(message = "{sysuser.email.require}", groups = DefaultGroup.class)
private Integer gender; @Email(message = "{sysuser.email.error}", groups = DefaultGroup.class)
private String email;
@ApiModelProperty(value = "邮箱", required = true) @ApiModelProperty(value = "手机号", required = true)
@NotBlank(message="{sysuser.email.require}", groups = DefaultGroup.class) @NotBlank(message = "{sysuser.mobile.require}", groups = DefaultGroup.class)
@Email(message="{sysuser.email.error}", groups = DefaultGroup.class) private String mobile;
private String email;
@ApiModelProperty(value = "手机号", required = true) @ApiModelProperty(value = "部门ID", required = true)
@NotBlank(message="{sysuser.mobile.require}", groups = DefaultGroup.class) @NotNull(message = "{sysuser.deptId.require}", groups = DefaultGroup.class)
private String mobile; private Long deptId;
@ApiModelProperty(value = "部门ID", required = true) @ApiModelProperty(value = "超级管理员 0：否 1：是")
@NotNull(message="{sysuser.deptId.require}", groups = DefaultGroup.class) @Range(min = 0, max = 1, message = "{sysuser.superadmin.range}", groups = DefaultGroup.class)
private Long deptId; private Integer superAdmin;
@ApiModelProperty(value = "超级管理员 0：否 1：是") @ApiModelProperty(value = "状态 0：停用 1：正常", required = true)
@Range(min=0, max=1, message = "{sysuser.superadmin.range}", groups = DefaultGroup.class) @Range(min = 0, max = 1, message = "{sysuser.status.range}", groups = DefaultGroup.class)
private Integer superAdmin; private Integer status;
@ApiModelProperty(value = "状态 0：停用 1：正常", required = true) @ApiModelProperty(value = "备注")
@Range(min=0, max=1, message = "{sysuser.status.range}", groups = DefaultGroup.class) private String remark;
private Integer status;
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "创建时间")
private String remark; @JsonProperty(access = JsonProperty.Access.READ_ONLY)
private Date createDate;
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "角色ID列表")
@JsonProperty(access = JsonProperty.Access.READ_ONLY) private List<Long> roleIdList;
private Date createDate;
@ApiModelProperty(value = "角色ID列表") @ApiModelProperty(value = "部门名称")
private List<Long> roleIdList; private String deptName;
@ApiModelProperty(value = "部门名称") /**
private String deptName; * 用户标签key
*/
private String userTagKey;
} }

141
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysUserEntity.java
View File

@ -1,8 +1,8 @@
/** /**
* Copyright (c) 2018 人人开源 All rights reserved. * Copyright (c) 2018 人人开源 All rights reserved.
* * <p>
* https://www.renren.io * https://www.renren.io
* * <p>
* 版权所有，侵权必究！ * 版权所有，侵权必究！
*/ */
@ -24,75 +24,80 @@ import java.util.Date;
* @since 1.0.0 * @since 1.0.0
*/ */
@Data @Data
@EqualsAndHashCode(callSuper=false) @EqualsAndHashCode(callSuper = false)
@TableName("sys_user") @TableName("sys_user")
public class SysUserEntity extends BaseEntity { public class SysUserEntity extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 用户名
*/
private String username;
/**
* 密码
*/
private String password;
/**
* 姓名
*/
private String realName;
/**
* 头像
*/
private String headUrl;
/**
* 性别 0：男 1：女 2：保密
*/
private Integer gender;
/**
* 邮箱
*/
private String email;
/**
* 手机号
*/
private String mobile;
/**
* 超级管理员 0：否 1：是
*/
private Integer superAdmin;
/**
* 状态 0：停用 1：正常
*/
private Integer status;
/**
* 备注
*/
private String remark;
/**
* 部门ID
*/
private Long deptId;
/**
* 删除标识 0：未删除 1：删除
*/
@TableField(fill = FieldFill.INSERT)
private Integer delFlag;
/**
* 更新者
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updater;
/**
* 更新时间
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateDate;
/** /**
* 用户名 * 部门名称
*/ */
private String username; @TableField(exist = false)
/** private String deptName;
* 密码
*/
private String password;
/**
* 姓名
*/
private String realName;
/**
* 头像
*/
private String headUrl;
/**
* 性别 0：男 1：女 2：保密
*/
private Integer gender;
/**
* 邮箱
*/
private String email;
/**
* 手机号
*/
private String mobile;
/**
* 超级管理员 0：否 1：是
*/
private Integer superAdmin;
/**
* 状态 0：停用 1：正常
*/
private Integer status;
/**
* 备注
*/
private String remark;
/**
* 部门ID
*/
private Long deptId;
/**
* 删除标识 0：未删除 1：删除
*/
@TableField(fill = FieldFill.INSERT)
private Integer delFlag;
/**
* 更新者
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updater;
/**
* 更新时间
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateDate;
/** /**
* 部门名称 * 用户标签键值
*/ */
@TableField(exist = false) private String userTagKey;
private String deptName;
} }

22
esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml
View File

@ -18,8 +18,26 @@
</select> </select>
<select id="getById" resultType="com.elink.esua.epdc.entity.SysUserEntity"> <select id="getById" resultType="com.elink.esua.epdc.entity.SysUserEntity">
select t1.*, (select t2.name from sys_dept t2 where t2.id=t1.dept_id) deptName from sys_user t1 select
where t1.id = #{value} and t1.del_flag = 0 t1.id,
t1.username,
t1.real_name,
t1.head_url,
t1.gender,
t1.email,
t1.mobile,
t1.dept_id,
t1.super_admin,
t1.status,
t1.remark,
t1.del_flag,
t1.creator,
t1.create_date,
t1.updater,
t1.update_date,
t1.user_tag_key,
(select t2.name from sys_dept t2 where t2.id=t1.dept_id) deptName from sys_user t1
where t1.id = #{value} and t1.del_flag = 0
</select> </select>
<select id="getByUsername" resultType="com.elink.esua.epdc.entity.SysUserEntity"> <select id="getByUsername" resultType="com.elink.esua.epdc.entity.SysUserEntity">

11
esua-epdc/epdc-gateway/pom.xml
View File

@ -92,11 +92,12 @@
<!-- gateway routes --> <!-- gateway routes -->
<gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri> <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
<gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri> <!-- <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>-->
<!-- <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>--> <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>
<gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server</gateway.routes.epdc-activiti-server.uri> <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
<!--<gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>--> </gateway.routes.epdc-activiti-server.uri>
<gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri> <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
<!-- <gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>-->
<gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri> <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
<!-- <gateway.routes.epdc-app-server.uri>http://127.0.0.1:9058</gateway.routes.epdc-app-server.uri>--> <!-- <gateway.routes.epdc-app-server.uri>http://127.0.0.1:9058</gateway.routes.epdc-app-server.uri>-->
<gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri> <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>

27
esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
View File

@ -99,6 +99,30 @@
<artifactId>docker-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<resources>
<resource>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>**/application*.yml</include>
<include>**/*.properties</include>
<include>logback-spring.xml</include>
<include>registry.conf</include>
</includes>
</resource>
<resource>
<directory>${basedir}/src/main/resources</directory>
<excludes>
<exclude>**/application*.yml</exclude>
<exclude>**/*.properties</exclude>
<exclude>registry.conf</exclude>
<exclude>logback-spring.xml</exclude>
</excludes>
</resource>
</resources>
</build> </build>
<profiles> <profiles>
@ -125,6 +149,7 @@
<nacos.register-enabled>false</nacos.register-enabled> <nacos.register-enabled>false</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr> <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<nacos.host>47.104.224.45</nacos.host>
<!--公众号配置--> <!--公众号配置-->
<wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId> <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
<wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret> <wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
@ -156,6 +181,7 @@
<nacos.register-enabled>true</nacos.register-enabled> <nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr> <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<nacos.host>47.104.224.45</nacos.host>
<!--公众号配置--> <!--公众号配置-->
<wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId> <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
<wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret> <wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
@ -187,6 +213,7 @@
<!-- nacos --> <!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled> <nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>172.31.171.61:9300</nacos.server-addr> <nacos.server-addr>172.31.171.61:9300</nacos.server-addr>
<nacos.host>172.31.171.61</nacos.host>
<!--公众号配置--> <!--公众号配置-->
<wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId> <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
<wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret> <wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf
View File

@ -3,7 +3,7 @@ registry {
type = "nacos" type = "nacos"
nacos { nacos {
serverAddr = "47.104.224.45" serverAddr = @nacos.host@
namespace = "public" namespace = "public"
cluster = "default" cluster = "default"
} }
@ -14,7 +14,7 @@ config {
type = "nacos" type = "nacos"
nacos { nacos {
serverAddr = "47.104.224.45" serverAddr = @nacos.host@
namespace = "public" namespace = "public"
cluster = "default" cluster = "default"
} }

Write Preview
Loading…
Cancel
Save