(*)dockerfile + dockerfile

api/Dockerfile

@@ -25,12 +25,14 @@
 
 FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2
 
+MAINTAINER liuxinyi "liu.xinyi@free-sun.com.cn"
+
 COPY . /var/app
 
 WORKDIR /var/app
 
-EXPOSE 8080
+RUN npm cache clean -f && npm install --production --force --registry http://10.8.30.22:7000
 
-CMD ["-u", "http://localhost:8088"]
+RUN rm -rf package-lock.json
 
-ENTRYPOINT [ "node", "server.js" ]
+CMD [ "node", "server.js" ]

jenkinsfile_poms_api

@@ -6,13 +6,12 @@ pipeline {
     }
     
     stages {
-        stage('Testing poms ......') {
+        stage('Testing hrm api......') {
             steps {
-                sh 'switch-auth.sh  anxinyun' 
+                buildName '#${BUILD_NUMBER} ~/pep/${JOB_NAME}:${IMAGE_VERSION}'
-                buildName "#${BUILD_NUMBER}  ~/fs-cloud/${JOB_NAME}:${IMAGE_VERSION}"
+				buildDescription 'harbor.anxinyun.cn/pep/${JOB_NAME}:${IMAGE_VERSION}'
-                buildDescription "registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}"
+				sh 'nerdctl build -t harbor.anxinyun.cn/pep/${JOB_NAME}:${IMAGE_VERSION} ./api'
-                sh 'docker build -t registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION} ./api' 
+				sh 'nerdctl push harbor.anxinyun.cn/pep/${JOB_NAME}:${IMAGE_VERSION}'
-                sh 'docker push registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}' 
             }
         }
     }

jenkinsfile_poms_web

@@ -6,13 +6,12 @@ pipeline {
     }
     
     stages {
-        stage('Testing poms ......') {
+        stage('Testing hrm-web ......') {
             steps {
-                sh 'switch-auth.sh  anxinyun' 
+                buildName "#${BUILD_NUMBER}  ~/pep/${JOB_NAME}:${IMAGE_VERSION}"
-                buildName "#${BUILD_NUMBER}  ~/fs-cloud/${JOB_NAME}:${IMAGE_VERSION}"
+                buildDescription "harbor.anxinyun.cn/pep/${JOB_NAME}:${IMAGE_VERSION}"
-                buildDescription "registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}"
+                sh 'nerdctl build -t harbor.anxinyun.cn/pep/${JOB_NAME}:${IMAGE_VERSION} ./web' 
-                sh 'docker build -t registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION} ./web' 
+                sh 'nerdctl push harbor.anxinyun.cn/pep/${JOB_NAME}:${IMAGE_VERSION}' 
-                sh 'docker push registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}' 
             }
         }
     }

web/Dockerfile

@@ -27,14 +27,19 @@
 # 旧版本构建方式
 
 
-FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2
+FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12-dev as builder
-
 COPY . /var/app
-
 WORKDIR /var/app
-
 EXPOSE 8080
-
+RUN npm config set registry=http://10.8.30.22:7000
-CMD ["-u", "http://localhost:8088"]
+RUN echo "{\"time\":\"$BUILD_TIMESTAMP\",\"build\": \"$BUILD_NUMBER\",\"revision\": \"$SVN_REVISION_1\",\"URL\":\"$SVN_URL_1\"}" > version.json
-
+RUN npm cache clean -f
-ENTRYPOINT [ "node", "server.js" ]
+RUN npm install --registry http://10.8.30.22:7000
+RUN npm run build
+RUN rm  -rf client/src
+RUN rm  -rf node_modules
+RUN npm install --production --force --registry http://10.8.30.22:7000
+FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node-16:7.22-06-20
+COPY --from=builder --chown=node /var/app  /home/node/app
+WORKDIR /home/node/app
+CMD ["node", "server.js"]

web/client/src/sections/humanAffairs/containers/resourceRepository.jsx

@@ -187,7 +187,7 @@ const ResourceRepository = (props) => {
                                 <Row type="flex" justify="space-around" align="middle">
                                     <Col span={18}>
                                         <Space>
-                                            <Button theme='solid' type='primary' >上传文件</Button>
+                                            {currentSelect && currentSelect.includes("部门培训资料") ? null : <Button theme='solid' type='primary' >上传文件</Button>}
                                             <span className="path-lable"><strong>当前文件夹：{currentSelect}</strong></span>
                                         </Space>
                                     </Col>