@IPU_REQ_2022@添加生成镜像所需插件和Dockerfile；将已经配置好的数据模板和业务控制流都加载到服务逻辑流中。

qb-auth-server/Dockerfile

@@ -0,0 +1,12 @@
FROM openjdk:8-jdk-alpine
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN adduser -D -h /ipu ipu
USER ipu
WORKDIR /ipu
ENV JVM_PARAM  " "
ARG JAR_FILE
ADD ${JAR_FILE}-bin.tar.gz .
ARG JAR_NAME
ENV DOCKER_JAR_NAME=$JAR_NAME
EXPOSE 8080
ENTRYPOINT java ${JVM_PARAM} -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar ./$DOCKER_JAR_NAME/$DOCKER_JAR_NAME.jar $0 $@

qb-auth-server/pom.xml

@@ -166,10 +166,10 @@
            </plugin>
            <!-- 添加docker镜像功能 -->
            <!--<plugin>
            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>dockerfile-maven-plugin</artifactId>
            </plugin>-->
            </plugin>
        </plugins>
    </build>
</project>

qb-auth-server/sql/系统权限管理v1.4.1.sql

@@ -25,7 +25,7 @@ drop table if exists sec_user;
/*==============================================================*/
create table sec_menu
(
   MENU_ID              bigint(20) not null auto_increment comment '菜单标识',
   MENU_ID              bigint(20) not null  comment '菜单标识',
   PARENT_MENU_ID       bigint(20) default NULL comment '上级菜单标识',
   SUB_COUNT            int(5) default NULL comment '子菜单数目',
   MENU_TYPE            varchar(3),
@@ -55,14 +55,14 @@ create table sec_menu
   TENANT_CODE          varchar(32),
   primary key (MENU_ID)
)
ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
/*==============================================================*/
/* Table: sec_org_user_rel                                      */
/*==============================================================*/
create table sec_org_user_rel
(
   ORG_USER_REL_ID      bigint(20) not null auto_increment comment '用户组织关系标识',
   ORG_USER_REL_ID      bigint(20) not null  comment '用户组织关系标识',
   ORGANIZE_ID          bigint(20) default NULL comment '组织标识',
   USER_ID              bigint(20) default NULL comment '用户标识',
   VALID_DATE           datetime default NULL comment '生效日期',
@@ -81,14 +81,14 @@ create table sec_org_user_rel
   TENANT_CODE          varchar(32),
   primary key (ORG_USER_REL_ID)
)
ENGINE=InnoDB AUTO_INCREMENT=101 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
/*==============================================================*/
/* Table: sec_organize                                          */
/*==============================================================*/
create table sec_organize
(
   ORGANIZE_ID          bigint(20) not null auto_increment comment '组织标识',
   ORGANIZE_ID          bigint(20) not null  comment '组织标识',
   ORGANIZE_TYPE        varchar(3),
   PARTY_ID             bigint(20) default NULL comment '参与人标识',
   ORGANIZE_NAME        varchar(200),
@@ -139,14 +139,14 @@ create table sec_organize
   TENANT_CODE          varchar(32),
   primary key (ORGANIZE_ID)
)
ENGINE=InnoDB AUTO_INCREMENT=33 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
/*==============================================================*/
/* Table: sec_priv_entity                                       */
/*==============================================================*/
create table sec_priv_entity
(
   PRIV_ENT_ID          bigint(20) not null auto_increment comment '权限实体标识',
   PRIV_ENT_ID          bigint(20) not null comment '权限实体标识',
   PRIV_ENT_NAME        varchar(255),
   PRIV_ENT_CODE        varchar(255),
   APP_ID               bigint(20) default NULL comment '使用系统标识',
@@ -171,14 +171,14 @@ create table sec_priv_entity
   TENANT_CODE          varchar(32),
   primary key (PRIV_ENT_ID)
)
ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
/*==============================================================*/
/* Table: sec_role                                              */
/*==============================================================*/
create table sec_role
(
   ROLE_ID              bigint(20) not null auto_increment comment '角色标识',
   ROLE_ID              bigint(20) not null comment '角色标识',
   JOB_ID               bigint(20) default NULL comment '岗位标识',
   ROLE_NAME            varchar(256),
   ROLE_TYPE            varchar(3),
@@ -200,14 +200,14 @@ create table sec_role
   TENANT_CODE          varchar(32),
   primary key (ROLE_ID)
)
ENGINE=InnoDB AUTO_INCREMENT=1001 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
/*==============================================================*/
/* Table: sec_role_grant                                        */
/*==============================================================*/
create table sec_role_grant
(
   ROLE_GRANT_ID        bigint(20) not null auto_increment comment '角色授权标识',
   ROLE_GRANT_ID        bigint(20) not null comment '角色授权标识',
   ROLE_ID              bigint(20) default NULL comment '角色标识',
   PRIV_ENT_ID          bigint(20) default NULL comment '实体标识',
   REMARK               varchar(100),
@@ -227,14 +227,14 @@ create table sec_role_grant
   TENANT_CODE          varchar(32),
   primary key (ROLE_GRANT_ID)
)
ENGINE=InnoDB AUTO_INCREMENT=1002 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
/*==============================================================*/
/* Table: sec_role_user_rel                                     */
/*==============================================================*/
create table sec_role_user_rel
(
   ROLE_USER_REL_ID     bigint(20) not null auto_increment comment '角色关联用户标识',
   ROLE_USER_REL_ID     bigint(20) not null comment '角色关联用户标识',
   USER_ID              bigint(20) not null comment '用户标识',
   ROLE_ID              bigint(20) not null comment '角色标识',
   VALID_DATE           datetime default NULL comment '生效日期',
@@ -253,14 +253,14 @@ create table sec_role_user_rel
   TENANT_CODE          varchar(32),
   primary key (ROLE_USER_REL_ID)
)
ENGINE=InnoDB AUTO_INCREMENT=101 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
/*==============================================================*/
/* Table: sec_user                                              */
/*==============================================================*/
create table sec_user
(
   USER_ID              bigint(20) not null auto_increment comment '用户标识',
   USER_ID              bigint(20) not null  comment '用户标识',
   NICK_NAME            varchar(256),
   USER_ACCOUNT         varchar(500),
   GENDER               varchar(2),
@@ -290,5 +290,5 @@ create table sec_user
   SURNAME              varchar(500),
   primary key (USER_ID)
)
ENGINE=InnoDB AUTO_INCREMENT=1482980362203303937 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

qb-auth-server/src/main/java/com/ipu/logicflow/server/util/LogicFlowConfig.java

@@ -43,7 +43,12 @@ public class LogicFlowConfig {
	public static void initModel() {
		modelPathMap.put("sec_user", "flow/user/model/sec_user.xml");
		modelPathMap.put("sec_organize", "flow/org/model/sec_organize.xml");
		//modelPathMap.put("sec_org_user_rel", "flow/org/model/sec_org_user_rel.xml");
		modelPathMap.put("sec_org_user_rel", "flow/org/model/sec_org_user_rel.xml");
		modelPathMap.put("sec_menu", "flow/menu/model/sec_menu.xml");
		modelPathMap.put("sec_priv_entity", "flow/menu/model/sec_priv_entity.xml");
		modelPathMap.put("sec_role_grant", "flow/role/model/sec_role_grant.xml");
		modelPathMap.put("sec_user_rel", "flow/role/model/sec_user_rel.xml");
		modelPathMap.put("sec_role", "flow/role/model/sec_role.xml");
		Iterator<String> it = modelPathMap.values().iterator();
		while (it.hasNext()) {
			LogicFlowUtil.loadLogicModel(it.next());
@@ -62,7 +67,41 @@ public class LogicFlowConfig {
		
		flowPathMap.put("organize_select", "flow/org/organize_select.xml");
		flowPathMap.put("organize_select_by_name", "flow/org/organize_select_by_name.xml");
		flowPathMap.put("organize_insert", "flow/org/organize_insert.xml");
		flowPathMap.put("organize_update", "flow/org/organize_update.xml");
		flowPathMap.put("dept_org_user_select", "flow/org/dept_org_user_select.xml");
		flowPathMap.put("org_user_rel_combine_select", "flow/org/org_user_rel_combine_select.xml");
		flowPathMap.put("org_user_rel_delete_by_cond", "flow/org/org_user_rel_delete_by_cond.xml");
		flowPathMap.put("org_user_rel_delete", "flow/org/org_user_rel_delete.xml");
		flowPathMap.put("org_user_rel_insert", "flow/org/org_user_rel_insert.xml");
		flowPathMap.put("org_user_rel_select_by_cond", "flow/org/org_user_rel_select_by_cond.xml");
		flowPathMap.put("org_user_rel_select_by_org_id", "flow/org/org_user_rel_select_by_org_id.xml");
		flowPathMap.put("org_user_rel_select", "flow/org/org_user_rel_select.xml");
		
		flowPathMap.put("aggregate_menu_select", "flow/menu/aggregate_menu_select.xml");
		flowPathMap.put("aggregate_priv_entity_select", "flow/menu/aggregate_priv_entity_select.xml");
		flowPathMap.put("menu_delete_by_cond", "flow/menu/menu_delete_by_cond.xml");
		flowPathMap.put("menu_insert", "flow/menu/menu_insert.xml");
		flowPathMap.put("menu_select", "flow/menu/menu_select.xml");
		flowPathMap.put("menu_update_by_cond", "flow/menu/menu_update_by_cond.xml");
		flowPathMap.put("priv_entity_delete", "flow/menu/priv_entity_delete.xml");
		flowPathMap.put("priv_entity_insert", "flow/menu/priv_entity_insert.xml");
		flowPathMap.put("priv_entity_update_by_cond", "flow/menu/priv_entity_update_by_cond.xml");
		flowPathMap.put("priv_entity_update_menu_by_cond", "flow/menu/priv_entity_update_menu_by_cond.xml");
		
		flowPathMap.put("role_delete", "flow/role/role_delete.xml");
		flowPathMap.put("role_grant_delete", "flow/role/role_grant_delete.xml");
		flowPathMap.put("role_grant_insert", "flow/role/role_grant_insert.xml");
		flowPathMap.put("role_grant_select", "flow/role/role_grant_select.xml");
		flowPathMap.put("role_grant_update_by_cond", "flow/role/role_grant_update_by_cond.xml");
		flowPathMap.put("role_insert", "flow/role/role_insert.xml");
		flowPathMap.put("role_select", "flow/role/role_select.xml");
		flowPathMap.put("role_update_by_cond", "flow/role/role_update_by_cond.xml");
		flowPathMap.put("role_user_rel_delete_by_cond", "flow/role/role_user_rel_delete_by_cond.xml");
		flowPathMap.put("role_user_rel_insert", "flow/role/role_user_rel_insert.xml");
		flowPathMap.put("role_user_rel_select_by_cond", "flow/role/role_user_rel_select_by_cond.xml");
		
		Iterator<String> it = flowPathMap.values().iterator();
		while (it.hasNext()) {
			LogicFlowUtil.loadLogicFlow(it.next());

qb-auth-server/src/main/resources/dev/ipu-mybatis-config.xml

@@ -13,7 +13,7 @@
        <!-- 分页插件，可根据参数定制化 -->
	    <plugin interceptor="com.github.pagehelper.PageInterceptor"></plugin>
	</plugins>
	<environments default="test">
	<environments default="auth">
		<environment id="auth">
			<transactionManager type="jdbc" />
			<dataSource type="com.ai.ipu.database.datasource.DruidDataSourceFactory">