提交 e27a1188 编写于 作者: ibizdev's avatar ibizdev

ibizdev提交

上级 baeea74d
...@@ -38,11 +38,11 @@ ...@@ -38,11 +38,11 @@
git clone -b master $para2 ibzuaa/ git clone -b master $para2 ibzuaa/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd ibzuaa/ cd ibzuaa/
mvn clean package -Puaaapi mvn clean package -Pweb
cd ibzuaa-provider/ibzuaa-provider-uaaapi cd ibzuaa-app/ibzuaa-app-web
mvn -Puaaapi docker:build mvn -Pweb docker:build
mvn -Puaaapi docker:push mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-provider-uaaapi.yaml dev --with-registry-auth docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-app-web.yaml dev --with-registry-auth
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-app-web.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-app-web.jar
EXPOSE 8080 EXPOSE 30002
ADD ibzuaa-app-web.jar /ibzuaa-app-web.jar ADD ibzuaa-app-web.jar /ibzuaa-app-web.jar
...@@ -3,7 +3,7 @@ services: ...@@ -3,7 +3,7 @@ services:
ibzuaa-app-web: ibzuaa-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
ports: ports:
- "8080:8080" - "30002:30002"
networks: networks:
- agent_network - agent_network
deploy: deploy:
......
server: server:
port: 8080 port: 30002
\ No newline at end of file \ No newline at end of file
server: server:
port: 8080 port: 30002
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
......
server: server:
port: 40002 port: 8080
\ No newline at end of file \ No newline at end of file
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-uaaapi.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-uaaapi.jar
EXPOSE 40002 EXPOSE 8081
ADD ibzuaa-provider-uaaapi.jar /ibzuaa-provider-uaaapi.jar ADD ibzuaa-provider-uaaapi.jar /ibzuaa-provider-uaaapi.jar
...@@ -3,7 +3,7 @@ services: ...@@ -3,7 +3,7 @@ services:
ibzuaa-provider-uaaapi: ibzuaa-provider-uaaapi:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-uaaapi:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-uaaapi:latest
ports: ports:
- "40002:40002" - "8081:8081"
networks: networks:
- agent_network - agent_network
deploy: deploy:
......
server: server:
port: 40002 port: 8081
\ No newline at end of file \ No newline at end of file
...@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner { ...@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner {
@Value("${ibiz.enablePermissionValid:false}") @Value("${ibiz.enablePermissionValid:false}")
boolean enablePermissionValid; //是否开启权限校验 boolean enablePermissionValid; //是否开启权限校验
@Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}") @Value("${ibiz.systemid:EB948A46-DF8C-4BE3-8020-0ADA23440D31}")
private String systemId; private String systemId;
@Override @Override
......
...@@ -22,7 +22,7 @@ public class SimpleUserService implements AuthenticationUserService{ ...@@ -22,7 +22,7 @@ public class SimpleUserService implements AuthenticationUserService{
@Value("${ibiz.enablePermissionValid:false}") @Value("${ibiz.enablePermissionValid:false}")
boolean enablePermissionValid; //是否开启权限校验 boolean enablePermissionValid; //是否开启权限校验
@Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}") @Value("${ibiz.systemid:EB948A46-DF8C-4BE3-8020-0ADA23440D31}")
private String systemid; private String systemid;
@Autowired @Autowired
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册