Browse Source

用户上传头像 部门添加字段

feature/dangjian
Jackwang 4 years ago
parent
commit
09b72afc05
  1. 44
      esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java
  2. 21
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java
  3. 6
      esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-dev.yml
  4. 12
      esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
  5. 6
      esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml

44
esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java

@ -67,6 +67,18 @@ public class SysDeptDTO extends TreeNode implements Serializable {
*/ */
private String partyCode; private String partyCode;
@ApiModelProperty(value = "地址")
private String address;
@ApiModelProperty(value = "联系方式")
private String mobile;
@ApiModelProperty(value = "经度")
private String longitude;
@ApiModelProperty(value = "纬度")
private String latitude;
public String getPartyCode() { public String getPartyCode() {
return partyCode; return partyCode;
} }
@ -134,4 +146,36 @@ public class SysDeptDTO extends TreeNode implements Serializable {
public void setPid(Long pid) { public void setPid(Long pid) {
this.pid = pid; this.pid = pid;
} }
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public String getMobile() {
return mobile;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
public String getLongitude() {
return longitude;
}
public void setLongitude(String longitude) {
this.longitude = longitude;
}
public String getLatitude() {
return latitude;
}
public void setLatitude(String latitude) {
this.latitude = latitude;
}
} }

21
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java

@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity; import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -79,4 +80,24 @@ public class SysDeptEntity extends BaseEntity {
*/ */
private String partyCode; private String partyCode;
/**
* 地址
*/
private String address;
/**
* 联系方式
*/
private String mobile;
/**
* 经度
*/
private String longitude;
/**
* 纬度
*/
private String latitude;
} }

6
esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-dev.yml

@ -8,9 +8,9 @@ spring:
datasource: datasource:
druid: druid:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://epdc-shibei.mysql.rds.aliyuncs.com:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai url: jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: epdc username: root
password: Elink@833066 password: Abc@123456
#Oracle #Oracle
# driver-class-name: oracle.jdbc.OracleDriver # driver-class-name: oracle.jdbc.OracleDriver
# url: jdbc:oracle:thin:@localhost:1521:xe # url: jdbc:oracle:thin:@localhost:1521:xe

12
esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml

@ -165,15 +165,15 @@
<server.port>9065</server.port> <server.port>9065</server.port>
<spring.redis.index>2</spring.redis.index> <spring.redis.index>2</spring.redis.index>
<spring.redis.host>47.104.224.45</spring.redis.host> <spring.redis.host>118.190.232.100</spring.redis.host>
<spring.redis.port>6379</spring.redis.port> <spring.redis.port>9603</spring.redis.port>
<spring.redis.password>elink@888</spring.redis.password> <spring.redis.password>epdc!redis@master1405</spring.redis.password>
<spring.datasource.druid.url> <spring.datasource.druid.url>
<![CDATA[jdbc:mysql://118.190.232.100:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]> <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url> </spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username> <spring.datasource.druid.username>root</spring.datasource.druid.username>
<spring.datasource.druid.password>elink833066</spring.datasource.druid.password> <spring.datasource.druid.password>Abc@123456</spring.datasource.druid.password>
<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>

6
esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml

@ -150,10 +150,10 @@
<spring.datasource.druid.password>Abc@123456</spring.datasource.druid.password> <spring.datasource.druid.password>Abc@123456</spring.datasource.druid.password>
<dynamic.datasource.first.url> <dynamic.datasource.first.url>
<![CDATA[jdbc:mysql://epdc-shibei.mysql.rds.aliyuncs.com:3306/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]> <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</dynamic.datasource.first.url> </dynamic.datasource.first.url>
<dynamic.datasource.first.username>epdc</dynamic.datasource.first.username> <dynamic.datasource.first.username>root</dynamic.datasource.first.username>
<dynamic.datasource.first.password>Elink@833066</dynamic.datasource.first.password> <dynamic.datasource.first.password>Abc@123456</dynamic.datasource.first.password>
<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>

Loading…
Cancel
Save