diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 9712b33..84083d2 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -1,5 +1,6 @@ #!/bin/sh -export deploy_path=/opt/builds/${JOB_NAME}/${BUILD_NUMBER} +#export deploy_path=/opt/builds/${JOB_NAME}/${BUILD_NUMBER} +export deploy_path=/opt/builds/${JOB_NAME} echo "--------moveFile start--------------" rm -rf $deploy_path mkdir -p $deploy_path diff --git a/scripts/pipeline.sh b/scripts/pipeline.sh index 2931132..aef41f1 100644 --- a/scripts/pipeline.sh +++ b/scripts/pipeline.sh @@ -5,6 +5,7 @@ pipeline { JAVA_HOME = '/usr/lib/jvm/jdk1.8.0_381' JOBNAME="${JOB_NAME}" JENKINS_NODE_COOKIE = "dontKillMe" + SPRING_PROFILES_ACTIVE = "sgzb_nw_dev" } stages { stage('Check out') { diff --git a/scripts/start.sh b/scripts/start.sh new file mode 100644 index 0000000..ea4c084 --- /dev/null +++ b/scripts/start.sh @@ -0,0 +1,27 @@ +RESOURCE_NAME=sgzb-modules-material-common-3.0.jar + +tpid=`ps -ef|grep $RESOURCE_NAME|grep -v grep|grep -v kill|awk '{print $2}'` +if [ ${tpid} ]; then +echo 'Stop Process...' +kill -15 $tpid +fi +sleep 5 +tpid=`ps -ef|grep $RESOURCE_NAME|grep -v grep|grep -v kill|awk '{print $2}'` +if [ ${tpid} ]; then +echo 'Kill Process!' +kill -9 $tpid +else +echo 'Stop Success!' +fi + +tpid=`ps -ef|grep $RESOURCE_NAME|grep -v grep|grep -v kill|awk '{print $2}'` +if [ ${tpid} ]; then + echo 'App is running.' +else + echo 'App is NOT running.' +fi + +rm -f tpid +nohup java -jar ./$RESOURCE_NAME --spring.profiles.active=sgzb_nw_dev & +echo $! > tpid +echo Start Success! diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysDept.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysDept.java index fea5c0c..6d2482c 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysDept.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysDept.java @@ -75,6 +75,12 @@ public class SysDept extends BaseEntity /** 所属组织id */ private Long companyId; + /** 企业机构代码（统一社会信用代码） */ + private String socialCreditCode; + + /** 企业归属代码 CSG-南方电网下属企业 SE-社会及大集体企业 */ + private String enterpriseOwnershipCode; + @Override public String getRemark() { return remark; @@ -93,6 +99,22 @@ public class SysDept extends BaseEntity this.companyId = companyId; } + public String getSocialCreditCode() { + return socialCreditCode; + } + + public void setSocialCreditCode(String socialCreditCode) { + this.socialCreditCode = socialCreditCode; + } + + public String getEnterpriseOwnershipCode() { + return enterpriseOwnershipCode; + } + + public void setEnterpriseOwnershipCode(String enterpriseOwnershipCode) { + this.enterpriseOwnershipCode = enterpriseOwnershipCode; + } + public Long getDeptId() { return deptId; diff --git a/sgzb-auth/src/main/resources/bootstrap-sgzb_nw_dev.yml b/sgzb-auth/src/main/resources/bootstrap-sgzb_nw_dev.yml index f48c7ca..2cb694c 100644 --- a/sgzb-auth/src/main/resources/bootstrap-sgzb_nw_dev.yml +++ b/sgzb-auth/src/main/resources/bootstrap-sgzb_nw_dev.yml @@ -4,11 +4,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.62:8848 + server-addr: 192.168.0.119:8848 namespace: sgzb_nwjj config: # 配置中心地址 - server-addr: 192.168.0.62:8848 + server-addr: 192.168.0.119:8848 namespace: sgzb_nwjj # 配置文件格式 file-extension: yml diff --git a/sgzb-gateway/src/main/resources/bootstrap-sgzb_nw_dev.yml b/sgzb-gateway/src/main/resources/bootstrap-sgzb_nw_dev.yml index 74e5d4f..7c417f7 100644 --- a/sgzb-gateway/src/main/resources/bootstrap-sgzb_nw_dev.yml +++ b/sgzb-gateway/src/main/resources/bootstrap-sgzb_nw_dev.yml @@ -11,11 +11,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.62:8848 + server-addr: 192.168.0.119:8848 namespace: sgzb_nwjj config: # 配置中心地址 - server-addr: 192.168.0.62:8848 + server-addr: 192.168.0.119:8848 namespace: sgzb_nwjj # 配置文件格式 file-extension: yml diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java index 2df3aec..f22f8b3 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java @@ -119,7 +119,13 @@ public class SysUserServiceImpl implements ISysUserService { */ @Override public SysUser selectUserByUserName(String userName) { - return userMapper.selectUserByUserName(userName); + SysUser sysUser = userMapper.selectUserByUserName(userName); + SysDept sysDept = deptMapper.selectDeptById(sysUser.getCompanyId()); + if (Objects.nonNull(sysUser.getDept()) && Objects.nonNull(sysDept)) { + sysUser.getDept().setSocialCreditCode(sysDept.getSocialCreditCode()); + sysUser.getDept().setEnterpriseOwnershipCode(sysDept.getEnterpriseOwnershipCode()); + } + return sysUser; } /** diff --git a/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_nw_dev.yml b/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_nw_dev.yml index f2fdf40..d3aa3ed 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_nw_dev.yml +++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap-sgzb_nw_dev.yml @@ -15,11 +15,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.62:8848 + server-addr: 192.168.0.119:8848 namespace: sgzb_nwjj config: # 配置中心地址 - server-addr: 192.168.0.62:8848 + server-addr: 192.168.0.119:8848 namespace: sgzb_nwjj # 配置文件格式 file-extension: yml diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysDeptMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysDeptMapper.xml index 21c037f..ed5c19a 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -22,11 +22,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time, - d.remark,d.company_id + d.remark,d.company_id,d.social_credit_code,d.enterprise_ownership_code from sys_dept d @@ -102,12 +104,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into sys_dept( - dept_id,parent_id,dept_name,ancestors,order_num,leader,phone,email,status,create_by,company_id,create_time) + dept_id,parent_id,dept_name,ancestors,order_num,leader,phone,email,status,create_by,company_id,create_time,social_credit_code,enterprise_ownership_code) values ( #{item.deptId},#{item.parentId},#{item.deptName},#{item.ancestors},#{item.orderNum},#{item.leader}, - #{item.phone},#{item.email},#{item.status},#{item.createBy},#{item.companyId},sysdate() + #{item.phone},#{item.email},#{item.status},#{item.createBy},#{item.companyId},sysdate(),#{item.socialCreditCode},#{item.enterpriseOwnershipCode} )