ibiz4j 部署微服务接口

config.xml

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

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysAuthLogSearchContext.java

@@ -24,10 +24,7 @@ import cn.ibizlab.core.uaa.domain.SysAuthLog;
  * 关系型数据实体[SysAuthLog] 查询条件对象
  */
 @Slf4j
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
+@Data
 public class SysAuthLogSearchContext extends QueryWrapperContext<SysAuthLog> {
 
 	private String n_username_like;//[用户全局名]

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysPSSystemSearchContext.java

@@ -24,10 +24,7 @@ import cn.ibizlab.core.uaa.domain.SysPSSystem;
  * 关系型数据实体[SysPSSystem] 查询条件对象
  */
 @Slf4j
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
+@Data
 public class SysPSSystemSearchContext extends QueryWrapperContext<SysPSSystem> {
 
 	private String n_pssystemname_like;//[系统名称]

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysPermissionSearchContext.java

@@ -24,10 +24,7 @@ import cn.ibizlab.core.uaa.domain.SysPermission;
  * 关系型数据实体[SysPermission] 查询条件对象
  */
 @Slf4j
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
+@Data
 public class SysPermissionSearchContext extends QueryWrapperContext<SysPermission> {
 
 	private String n_sys_permissionid_like;//[资源标识]

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysRolePermissionSearchContext.java

@@ -24,10 +24,7 @@ import cn.ibizlab.core.uaa.domain.SysRolePermission;
  * 关系型数据实体[SysRolePermission] 查询条件对象
  */
 @Slf4j
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
+@Data
 public class SysRolePermissionSearchContext extends QueryWrapperContext<SysRolePermission> {
 
 	private String n_sys_roleid_eq;//[角色表标识]

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysRoleSearchContext.java

@@ -24,10 +24,7 @@ import cn.ibizlab.core.uaa.domain.SysRole;
  * 关系型数据实体[SysRole] 查询条件对象
  */
 @Slf4j
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
+@Data
 public class SysRoleSearchContext extends QueryWrapperContext<SysRole> {
 
 	private String n_sys_rolename_isnotnull;//[角色表名称]

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysUserRoleSearchContext.java

@@ -24,10 +24,7 @@ import cn.ibizlab.core.uaa.domain.SysUserRole;
  * 关系型数据实体[SysUserRole] 查询条件对象
  */
 @Slf4j
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
+@Data
 public class SysUserRoleSearchContext extends QueryWrapperContext<SysUserRole> {
 
 	private String n_sys_roleid_eq;//[角色表标识]

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysUserSearchContext.java

@@ -24,10 +24,7 @@ import cn.ibizlab.core.uaa.domain.SysUser;
  * 关系型数据实体[SysUser] 查询条件对象
  */
 @Slf4j
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
+@Data
 public class SysUserSearchContext extends QueryWrapperContext<SysUser> {
 
 	private String n_username_like;//[用户全局名]

ibzuaa-provider/ibzuaa-provider-api/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 /ibzuaa-provider-api.jar
 
-EXPOSE 8081
+EXPOSE 40002
 
 ADD ibzuaa-provider-api.jar /ibzuaa-provider-api.jar

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/ibzuaa-provider-api.yaml

@@ -3,9 +3,21 @@ services:
   ibzuaa-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
     ports:
-      - "8081:8081"
+      - "40002:40002"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=40002
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
+      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
     deploy:
       mode: replicated
       replicas: 1

ibzuaa-util/src/main/java/cn/ibizlab/util/filter/QueryBuildContext.java

@@ -7,10 +7,7 @@ import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
+@Data
 public class QueryBuildContext extends SearchContextBase implements ISearchContext{
 
     @JsonIgnore

ibzuaa-util/src/main/java/cn/ibizlab/util/filter/QueryWrapperContext.java

@@ -17,10 +17,7 @@ import java.util.Iterator;
 import java.util.List;
 
 @Slf4j
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
+@Data
 public class QueryWrapperContext<T> extends SearchContextBase implements ISearchContext{
 
     @JsonIgnore

ibzuaa-util/src/main/java/cn/ibizlab/util/filter/SearchContextBase.java

@@ -17,10 +17,7 @@ import java.util.List;
 import java.util.Map;
 
 @Slf4j
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
+@Data
 public class SearchContextBase implements ISearchContext{
 
     /**