From 5395f9f3e0824d8ae96e38658983e8968670421b Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 30 Aug 2024 16:43:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/deploy.sh | 3 ++- scripts/pipeline.sh | 1 + scripts/start.sh | 27 +++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 scripts/start.sh 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! From 1c2eae8628dc50a939e53c6b1daec1edab389ad3 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 4 Sep 2024 11:50:41 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=8A=A0=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/system/api/domain/SysDept.java | 22 +++++++++++++++++++ .../resources/mapper/system/SysDeptMapper.xml | 4 +++- .../resources/mapper/system/SysUserMapper.xml | 4 +++- 3 files changed, 28 insertions(+), 2 deletions(-) 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-modules/sgzb-system/src/main/resources/mapper/system/SysDeptMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysDeptMapper.xml index 21c037f..5454f31 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 diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml index d745955..cea8447 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -36,6 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -49,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.company_id, - d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, + d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, d.social_credit_code as socialCreditCode,d.enterprise_ownership_code as enterpriseOwnershipCode r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status from sys_user u left join sys_dept d on u.dept_id = d.dept_id From a24a6f8e86f2a37df83241ef0766aaf32aed8b6c Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 4 Sep 2024 14:15:29 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=8A=A0=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/system/SysDeptMapper.xml | 4 ++-- .../src/main/resources/mapper/system/SysUserMapper.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 5454f31..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 @@ -104,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} ) diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml index cea8447..d7a9170 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.company_id, - d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, d.social_credit_code as socialCreditCode,d.enterprise_ownership_code as enterpriseOwnershipCode + d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, d.social_credit_code as socialCreditCode,d.enterprise_ownership_code as enterpriseOwnershipCode, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status from sys_user u left join sys_dept d on u.dept_id = d.dept_id From 0508383e8d12c5c54f2f90acb9facdbe4e3a3b4e Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 4 Sep 2024 14:59:40 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=8A=A0=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/system/service/impl/SysUserServiceImpl.java | 8 +++++++- .../src/main/resources/mapper/system/SysUserMapper.xml | 4 +--- 2 files changed, 8 insertions(+), 4 deletions(-) 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/mapper/system/SysUserMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml index d7a9170..d745955 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -36,8 +36,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - @@ -51,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.company_id, - d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, d.social_credit_code as socialCreditCode,d.enterprise_ownership_code as enterpriseOwnershipCode, + d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status from sys_user u left join sys_dept d on u.dept_id = d.dept_id From fb40e1f4dc3834bd6c93e91adf42de46425be599 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 10 Sep 2024 13:37:44 +0800 Subject: [PATCH 5/5] change ip --- sgzb-auth/src/main/resources/bootstrap-sgzb_nw_dev.yml | 4 ++-- sgzb-gateway/src/main/resources/bootstrap-sgzb_nw_dev.yml | 4 ++-- .../sgzb-system/src/main/resources/bootstrap-sgzb_nw_dev.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) 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/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