ibizdev提交

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 ibzrt/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzrt/
-      mvn clean package -Pweb
-      cd ibzrt-app/ibzrt-app-web
-      mvn -Pweb docker:build
-      mvn -Pweb docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzrt-app-web.yaml ibzlab-rt --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzrt-app/ibzrt-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzrt-app-web.jar
 
-EXPOSE 30000
+EXPOSE 8080
 
 ADD ibzrt-app-web.jar /ibzrt-app-web.jar

ibzrt-app/ibzrt-app-web/src/main/docker/ibzrt-app-web.yaml

@@ -3,11 +3,9 @@ services:
   ibzrt-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest
     ports:
-      - "30000:30000"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

ibzrt-app/ibzrt-app-web/src/main/resources/application-web-dev.yml

 server:
-  port: 30000
+  port: 8080
\ No newline at end of file

ibzrt-app/ibzrt-app-web/src/main/resources/application-web-prod.yml

 server:
-  port: 30000
+  port: 8080
 
 #zuul网关路由设置
 zuul:

ibzrt-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZEmployeeServiceImpl.java

@@ -97,6 +97,12 @@ public class IBZEmployeeServiceImpl implements IIBZEmployeeService {
         iBZEmployeeFeignClient.saveBatch(list) ;
     }
 
+    @Override
+    @Transactional
+    public IBZEmployee initPwd(IBZEmployee et) {
+        //自定义代码
+        return et;
+    }
 
     @Override
     public IBZEmployee getDraft(IBZEmployee et) {