Merge remote-tracking branch 'origin/master'

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

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') {

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!

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;

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

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

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;
     }
 
     /**

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

sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -22,11 +22,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateTime" column="update_time" />
 		<result property="remark" column="remark" />
 		<result property="companyId" column="company_id" />
+		<result property="socialCreditCode" column="social_credit_code" />
+		<result property="enterpriseOwnershipCode" column="enterprise_ownership_code" />
 	</resultMap>
 	
 	<sql id="selectDeptVo">
         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
     </sql>
     
@@ -102,12 +104,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<insert id="insertCompanies" parameterType="com.bonus.sgzb.system.api.domain.SysDept">
 		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
 		<foreach item="item" index="index" collection="depts" separator=",">
 			(
 			#{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}
 			)
 		</foreach>
 	</insert>