lab_qyk 部署微服务接口

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-app/ibzuaa-app-web/src/main/docker/Dockerfile

 
 FROM openjdk:8-jre-alpine
 
-ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
+ENV TZ=Asia/Shanghai \
+    SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
     IBIZ_SLEEP=0 \
     JAVA_OPTS=""
 
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
 CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-app-web.jar

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysRole.java

@@ -81,6 +81,28 @@ public class SysRole extends EntityMP implements Serializable {
     @JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("updatedate")
     private Timestamp updatedate;
+    /**
+     * 父角色标识
+     */
+    @TableField(value = "proleid")
+    @JSONField(name = "proleid")
+    @JsonProperty("proleid")
+    private String proleid;
+    /**
+     * 父角色名称
+     */
+    @TableField(exist = false)
+    @JSONField(name = "prolename")
+    @JsonProperty("prolename")
+    private String prolename;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.core.uaa.domain.SysRole psysRole;
 
 
 
@@ -100,6 +122,14 @@ public class SysRole extends EntityMP implements Serializable {
         this.modify("memo",memo);
     }
 
+    /**
+     * 设置 [父角色标识]
+     */
+    public void setProleid(String proleid){
+        this.proleid = proleid ;
+        this.modify("proleid",proleid);
+    }
+
 
 }
 

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

@@ -52,6 +52,27 @@ public class SysRoleSearchContext extends QueryWrapperContext<SysRole> {
             this.getSearchCond().like("sys_rolename", n_sys_rolename_like);
         }
     }
+	private String n_proleid_eq;//[父角色标识]
+	public void setN_proleid_eq(String n_proleid_eq) {
+        this.n_proleid_eq = n_proleid_eq;
+        if(!ObjectUtils.isEmpty(this.n_proleid_eq)){
+            this.getSearchCond().eq("proleid", n_proleid_eq);
+        }
+    }
+	private String n_prolename_eq;//[父角色名称]
+	public void setN_prolename_eq(String n_prolename_eq) {
+        this.n_prolename_eq = n_prolename_eq;
+        if(!ObjectUtils.isEmpty(this.n_prolename_eq)){
+            this.getSearchCond().eq("prolename", n_prolename_eq);
+        }
+    }
+	private String n_prolename_like;//[父角色名称]
+	public void setN_prolename_like(String n_prolename_like) {
+        this.n_prolename_like = n_prolename_like;
+        if(!ObjectUtils.isEmpty(this.n_prolename_like)){
+            this.getSearchCond().like("prolename", n_prolename_like);
+        }
+    }
 
     /**
 	 * 启用快速搜索

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SysRoleMapper.java

@@ -67,4 +67,6 @@ public interface SysRoleMapper extends BaseMapper<SysRole>{
     @Delete("${sql}")
     boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
 
+    List<SysRole> selectByProleid(@Param("roleid") Serializable roleid) ;
+
 }

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISysRoleService.java

@@ -41,6 +41,9 @@ public interface ISysRoleService extends IService<SysRole>{
     @CacheEvict(value="sysrole",allEntries=true)
     void saveBatch(List<SysRole> list) ;
     Page<SysRole> searchDefault(SysRoleSearchContext context) ;
+    List<SysRole> selectByProleid(String roleid) ;
+    @CacheEvict(value="sysrole",allEntries=true)
+    void removeByProleid(String roleid) ;
     /**
      *自定义查询SQL
      * @param sql  select * from table where id =#{et.param}

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysRoleServiceImpl.java

@@ -47,6 +47,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     @Autowired
     @Lazy
     protected cn.ibizlab.core.uaa.service.ISysRolePermissionService sysrolepermissionService;
+
+    protected cn.ibizlab.core.uaa.service.ISysRoleService sysroleService = this;
     @Autowired
     @Lazy
     protected cn.ibizlab.core.uaa.service.ISysUserRoleService sysuserroleService;
@@ -56,6 +58,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     @Override
     @Transactional
     public boolean create(SysRole et) {
+        fillParentData(et);
         if(!this.retBool(this.baseMapper.insert(et)))
             return false;
         CachedBeanCopier.copy(get(et.getRoleid()),et);
@@ -64,12 +67,14 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 
     @Override
     public void createBatch(List<SysRole> list) {
+        list.forEach(item->fillParentData(item));
         this.saveBatch(list,batchSize);
     }
 
     @Override
     @Transactional
     public boolean update(SysRole et) {
+        fillParentData(et);
         if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("sys_roleid",et.getRoleid())))
             return false;
         CachedBeanCopier.copy(get(et.getRoleid()),et);
@@ -78,6 +83,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 
     @Override
     public void updateBatch(List<SysRole> list) {
+        list.forEach(item->fillParentData(item));
         updateBatchById(list,batchSize);
     }
 
@@ -108,6 +114,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 
     @Override
     public SysRole getDraft(SysRole et) {
+        fillParentData(et);
         return et;
     }
 
@@ -137,16 +144,28 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 
     @Override
     public boolean saveBatch(Collection<SysRole> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
         return true;
     }
 
     @Override
     public void saveBatch(List<SysRole> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
     }
 
 
+	@Override
+    public List<SysRole> selectByProleid(String roleid) {
+        return baseMapper.selectByProleid(roleid);
+    }
+
+    @Override
+    public void removeByProleid(String roleid) {
+        this.remove(new QueryWrapper<SysRole>().eq("proleid",roleid));
+    }
+
 
     /**
      * 查询集合 DEFAULT
@@ -159,6 +178,22 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 
 
 
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(SysRole et){
+        //实体关系[DER1N_SYS_ROLE_SYS_ROLE_PROLEID]
+        if(!ObjectUtils.isEmpty(et.getProleid())){
+            cn.ibizlab.core.uaa.domain.SysRole psysRole=et.getPsysRole();
+            if(ObjectUtils.isEmpty(psysRole)){
+                cn.ibizlab.core.uaa.domain.SysRole majorEntity=sysroleService.get(et.getProleid());
+                et.setPsysRole(majorEntity);
+                psysRole=majorEntity;
+            }
+            et.setProlename(psysRole.getRolename());
+        }
+    }
 
 
 

ibzuaa-core/src/main/resources/liquibase/h2_table.xml

@@ -74,7 +74,7 @@
 
 
     <!--输出实体[SYS_ROLE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_role-94-4">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_role-106-4">
         <createTable tableName="IBZROLE">
                 <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>
@@ -87,6 +87,8 @@
                 </column>
                 <column name="UPDATEDATE" remarks="" type="DATETIME">
                 </column>
+                <column name="PROLEID" remarks="" type="VARCHAR(100)">
+                </column>
         </createTable>
     </changeSet>
 
@@ -132,12 +134,15 @@
         <!--输出实体[SYS_PSSYSTEM]外键关系 -->
         <!--输出实体[SYS_PERMISSION]外键关系 -->
         <!--输出实体[SYS_ROLE]外键关系 -->
+    <changeSet author="a_A_5d9d78509" id="fk-sys_role-106-7">
+       <addForeignKeyConstraint baseColumnNames="PROLEID" baseTableName="IBZROLE" constraintName="DER1N_SYS_ROLE_SYS_ROLE_PROLEI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_ROLEID" referencedTableName="IBZROLE" validate="true"/>
+    </changeSet>
         <!--输出实体[SYS_ROLE_PERMISSION]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_role_permission-98-7">
+    <changeSet author="a_A_5d9d78509" id="fk-sys_role_permission-98-8">
        <addForeignKeyConstraint baseColumnNames="SYS_PERMISSIONID" baseTableName="IBZROLE_PERMISSION" constraintName="DER1N_SYS_ROLE_PERMISSION_SYS_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_PERMISSIONID" referencedTableName="IBZPERMISSION" validate="true"/>
     </changeSet>
         <!--输出实体[SYS_USER_ROLE]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_user_role-72-9">
+    <changeSet author="a_A_5d9d78509" id="fk-sys_user_role-72-10">
        <addForeignKeyConstraint baseColumnNames="SYS_ROLEID" baseTableName="IBZUSER_ROLE" constraintName="DER1N_SYS_USER_ROLE_SYS_ROLE_S" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_ROLEID" referencedTableName="IBZROLE" validate="true"/>
     </changeSet>
 

ibzuaa-core/src/main/resources/mapper/uaa/sysrole/SysRoleMapper.xml

@@ -9,10 +9,20 @@
     <resultMap id="SysRoleResultMap" type="cn.ibizlab.core.uaa.domain.SysRole" autoMapping="true">
         <id property="roleid" column="sys_roleid" /><!--主键字段映射-->
 		<result property="rolename" column="sys_rolename" />
+		<result property="proleid" column="proleid" />
             
 		
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="psysRole" javaType="cn.ibizlab.core.uaa.domain.SysRole" column="proleid" select="cn.ibizlab.core.uaa.mapper.SysRoleMapper.selectById" fetchType="lazy"></association>
     </resultMap>
 
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_SYS_ROLE_SYS_ROLE_PROLEID] -->
+	 <select id="selectByProleid" resultMap="SysRoleResultMap">
+         select t1.* from (
+                <include refid="Default" />
+         ) t1
+         where  proleid=#{roleid}
+     </select>
 
     <!--数据集合[Default]-->
 	 <select id="searchDefault"  parameterType="cn.ibizlab.core.uaa.filter.SysRoleSearchContext"  resultMap="SysRoleResultMap">
@@ -25,7 +35,7 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`MEMO`, t1.`SYS_ROLEID`, t1.`SYS_ROLENAME`, t1.`UPDATEDATE` FROM `IBZROLE` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`MEMO`, t1.`PROLEID`, t11.`SYS_ROLENAME` AS `PROLENAME`, t1.`SYS_ROLEID`, t1.`SYS_ROLENAME`, t1.`UPDATEDATE` FROM `IBZROLE` t1  LEFT JOIN IBZROLE t11 ON t1.PROLEID = t11.SYS_ROLEID  
 			]]>
     </sql>
     <!--数据查询[Default]-->

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/Dockerfile

 
 FROM openjdk:8-jre-alpine
 
-ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
+ENV TZ=Asia/Shanghai \
+    SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
     IBIZ_SLEEP=0 \
     JAVA_OPTS=""
 
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
 CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_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,22 @@ 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
+      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits:

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SysRoleDTO.java

@@ -65,6 +65,22 @@ public class SysRoleDTO extends DTOBase implements Serializable {
     @JsonProperty("updatedate")
     private Timestamp updatedate;
 
+    /**
+     * 属性 [PROLEID]
+     *
+     */
+    @JSONField(name = "proleid")
+    @JsonProperty("proleid")
+    private String proleid;
+
+    /**
+     * 属性 [PROLENAME]
+     *
+     */
+    @JSONField(name = "prolename")
+    @JsonProperty("prolename")
+    private String prolename;
+
 
     /**
      * 设置 [SYS_ROLENAME]
@@ -82,6 +98,14 @@ public class SysRoleDTO extends DTOBase implements Serializable {
         this.modify("memo",memo);
     }
 
+    /**
+     * 设置 [PROLEID]
+     */
+    public void setProleid(String  proleid){
+        this.proleid = proleid ;
+        this.modify("proleid",proleid);
+    }
+
 
 }
 

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/mapping/SysAppMapping.java

@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.SysAppDTO;
 import cn.ibizlab.util.domain.MappingBase;
 import org.mapstruct.factory.Mappers;
 
-@Mapper(componentModel = "spring", uses = {},
+@Mapper(componentModel = "spring", uses = {},implementationName="apiSysAppMapping",
     nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
     nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 public interface SysAppMapping extends MappingBase<SysAppDTO, SysApp> {

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/mapping/SysAuthLogMapping.java

@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.SysAuthLogDTO;
 import cn.ibizlab.util.domain.MappingBase;
 import org.mapstruct.factory.Mappers;
 
-@Mapper(componentModel = "spring", uses = {},
+@Mapper(componentModel = "spring", uses = {},implementationName="apiSysAuthLogMapping",
     nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
     nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 public interface SysAuthLogMapping extends MappingBase<SysAuthLogDTO, SysAuthLog> {

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/mapping/SysPSSystemMapping.java

@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.SysPSSystemDTO;
 import cn.ibizlab.util.domain.MappingBase;
 import org.mapstruct.factory.Mappers;
 
-@Mapper(componentModel = "spring", uses = {},
+@Mapper(componentModel = "spring", uses = {},implementationName="apiSysPSSystemMapping",
     nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
     nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 public interface SysPSSystemMapping extends MappingBase<SysPSSystemDTO, SysPSSystem> {

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/mapping/SysPermissionMapping.java

@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.SysPermissionDTO;
 import cn.ibizlab.util.domain.MappingBase;
 import org.mapstruct.factory.Mappers;
 
-@Mapper(componentModel = "spring", uses = {},
+@Mapper(componentModel = "spring", uses = {},implementationName="apiSysPermissionMapping",
     nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
     nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 public interface SysPermissionMapping extends MappingBase<SysPermissionDTO, SysPermission> {

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/mapping/SysRoleMapping.java

@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.SysRoleDTO;
 import cn.ibizlab.util.domain.MappingBase;
 import org.mapstruct.factory.Mappers;
 
-@Mapper(componentModel = "spring", uses = {},
+@Mapper(componentModel = "spring", uses = {},implementationName="apiSysRoleMapping",
     nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
     nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 public interface SysRoleMapping extends MappingBase<SysRoleDTO, SysRole> {

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/mapping/SysRolePermissionMapping.java

@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.SysRolePermissionDTO;
 import cn.ibizlab.util.domain.MappingBase;
 import org.mapstruct.factory.Mappers;
 
-@Mapper(componentModel = "spring", uses = {},
+@Mapper(componentModel = "spring", uses = {},implementationName="apiSysRolePermissionMapping",
     nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
     nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 public interface SysRolePermissionMapping extends MappingBase<SysRolePermissionDTO, SysRolePermission> {

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/mapping/SysUserMapping.java

@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.SysUserDTO;
 import cn.ibizlab.util.domain.MappingBase;
 import org.mapstruct.factory.Mappers;
 
-@Mapper(componentModel = "spring", uses = {},
+@Mapper(componentModel = "spring", uses = {},implementationName="apiSysUserMapping",
     nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
     nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 public interface SysUserMapping extends MappingBase<SysUserDTO, SysUser> {

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/mapping/SysUserRoleMapping.java

@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.SysUserRoleDTO;
 import cn.ibizlab.util.domain.MappingBase;
 import org.mapstruct.factory.Mappers;
 
-@Mapper(componentModel = "spring", uses = {},
+@Mapper(componentModel = "spring", uses = {},implementationName="apiSysUserRoleMapping",
     nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
     nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 public interface SysUserRoleMapping extends MappingBase<SysUserRoleDTO, SysUserRole> {