Skip to content

I
ibznotify
提交 44c7acfd 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码

上级 118fae27
显示空白字符变更
内嵌 并排
正在显示 包含 110 行增加 和 76 行删除
app_web/src/locale/lanres/entities/msg-open-access/msg-open-access_en_US.ts
浏览文件 @ 44c7acfd
...@@ -10,6 +10,7 @@ export default { ...@@ -10,6 +10,7 @@ export default {
access_token: "管理账号token", access_token: "管理账号token",
expires_time: "管理账号token过期时间", expires_time: "管理账号token过期时间",
disabled: "是否禁用", disabled: "是否禁用",
redirect_uri: "RedirectURI",
}, },
views: { views: {
editview: { editview: {
......
app_web/src/locale/lanres/entities/msg-open-access/msg-open-access_zh_CN.ts
浏览文件 @ 44c7acfd
...@@ -9,6 +9,7 @@ export default { ...@@ -9,6 +9,7 @@ export default {
access_token: "管理账号token", access_token: "管理账号token",
expires_time: "管理账号token过期时间", expires_time: "管理账号token过期时间",
disabled: "是否禁用", disabled: "是否禁用",
redirect_uri: "RedirectURI",
}, },
views: { views: {
editview: { editview: {
......
app_web/src/pages/notify/msg-open-access-grid-view/msg-open-access-grid-view-base.vue
浏览文件 @ 44c7acfd
...@@ -1223,16 +1223,28 @@ export default class MsgOpenAccessGridViewBase extends Vue { ...@@ -1223,16 +1223,28 @@ export default class MsgOpenAccessGridViewBase extends Vue {
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
{ pathName: 'msgopenaccesses', parameterName: 'msgopenaccess' }, { pathName: 'msgopenaccesses', parameterName: 'msgopenaccess' },
{ pathName: 'editview', parameterName: 'editview' },
]; ];
const _this: any = this; const _this: any = this;
const openIndexViewTab = (data: any) => { const openDrawer = (view: any, data: any) => {
const _data: any = { w: (new Date().getTime()) }; let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
Object.assign(_data, data); container.subscribe((result: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data); if (!result || !Object.is(result.ret, 'OK')) {
this.$router.push(routePath); return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
} }
openIndexViewTab(data); xData.refresh(result.datas);
});
}
const view: any = {
viewname: 'msg-open-access-edit-view',
height: 0,
width: 0,
title: this.$t('entities.msgopenaccess.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
} }
...@@ -1264,17 +1276,31 @@ export default class MsgOpenAccessGridViewBase extends Vue { ...@@ -1264,17 +1276,31 @@ export default class MsgOpenAccessGridViewBase extends Vue {
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
{ pathName: 'msgopenaccesses', parameterName: 'msgopenaccess' }, { pathName: 'msgopenaccesses', parameterName: 'msgopenaccess' },
{ pathName: 'editview', parameterName: 'editview' },
]; ];
const _this: any = this; const _this: any = this;
if(fullargs && fullargs.copymode){ if(fullargs && fullargs.copymode){
Object.assign(data,{copymode:true}); Object.assign(data,{copymode:true});
} }
const openIndexViewTab = (data: any) => { const openDrawer = (view: any, data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data); let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
this.$router.push(routePath); container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
} }
openIndexViewTab(data); xData.refresh(result.datas);
});
}
const view: any = {
viewname: 'msg-open-access-edit-view',
height: 0,
width: 0,
title: this.$t('entities.msgopenaccess.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
} }
......
app_web/src/widgets/msg-open-access/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ 44c7acfd
...@@ -42,6 +42,9 @@ export default class PickupViewpickupviewpanelModel { ...@@ -42,6 +42,9 @@ export default class PickupViewpickupviewpanelModel {
{ {
name: 'disabled', name: 'disabled',
}, },
{
name: 'redirect_uri',
},
] ]
} }
......
ibznotify-core/src/main/java/cn/ibizlab/core/notify/domain/MsgOpenAccess.java
浏览文件 @ 44c7acfd
...@@ -113,6 +113,14 @@ public class MsgOpenAccess extends EntityMP implements Serializable { ...@@ -113,6 +113,14 @@ public class MsgOpenAccess extends EntityMP implements Serializable {
@JSONField(name = "disabled") @JSONField(name = "disabled")
@JsonProperty("disabled") @JsonProperty("disabled")
private Integer disabled; private Integer disabled;
/**
* RedirectURI
*/
@DEField(name = "redirect_uri")
@TableField(value = "redirect_uri")
@JSONField(name = "redirect_uri")
@JsonProperty("redirect_uri")
private String redirectUri;
...@@ -190,6 +198,14 @@ public class MsgOpenAccess extends EntityMP implements Serializable { ...@@ -190,6 +198,14 @@ public class MsgOpenAccess extends EntityMP implements Serializable {
this.modify("disabled",disabled); this.modify("disabled",disabled);
} }
/**
* 设置 [RedirectURI]
*/
public void setRedirectUri(String redirectUri){
this.redirectUri = redirectUri ;
this.modify("redirect_uri",redirectUri);
}
} }
......
ibznotify-core/src/main/java/cn/ibizlab/core/notify/mapper/MsgOpenAccessMapper.java
浏览文件 @ 44c7acfd
...@@ -21,14 +21,19 @@ public interface MsgOpenAccessMapper extends BaseMapper<MsgOpenAccess>{ ...@@ -21,14 +21,19 @@ public interface MsgOpenAccessMapper extends BaseMapper<MsgOpenAccess>{
Page<MsgOpenAccess> searchDefault(IPage page, @Param("srf") MsgOpenAccessSearchContext context, @Param("ew") Wrapper<MsgOpenAccess> wrapper) ; Page<MsgOpenAccess> searchDefault(IPage page, @Param("srf") MsgOpenAccessSearchContext context, @Param("ew") Wrapper<MsgOpenAccess> wrapper) ;
@Override @Override
@Cacheable( value="msgopenaccess",key = "'row:'+#p0")
MsgOpenAccess selectById(Serializable id); MsgOpenAccess selectById(Serializable id);
@Override @Override
@CacheEvict( value="msgopenaccess",key = "'row:'+#p0.id")
int insert(MsgOpenAccess entity); int insert(MsgOpenAccess entity);
@Override @Override
@CacheEvict( value="msgopenaccess",key = "'row:'+#p0.id")
int updateById(@Param(Constants.ENTITY) MsgOpenAccess entity); int updateById(@Param(Constants.ENTITY) MsgOpenAccess entity);
@Override @Override
@CacheEvict(value="msgopenaccess",key = "'row:'+#p0.id")
int update(@Param(Constants.ENTITY) MsgOpenAccess entity, @Param("ew") Wrapper<MsgOpenAccess> updateWrapper); int update(@Param(Constants.ENTITY) MsgOpenAccess entity, @Param("ew") Wrapper<MsgOpenAccess> updateWrapper);
@Override @Override
@CacheEvict( value="msgopenaccess",key = "'row:'+#p0")
int deleteById(Serializable id); int deleteById(Serializable id);
/** /**
* 自定义查询SQL * 自定义查询SQL
......
ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/IMsgOpenAccessService.java
浏览文件 @ 44c7acfd
...@@ -26,15 +26,19 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -26,15 +26,19 @@ import com.baomidou.mybatisplus.extension.service.IService;
public interface IMsgOpenAccessService extends IService<MsgOpenAccess>{ public interface IMsgOpenAccessService extends IService<MsgOpenAccess>{
boolean create(MsgOpenAccess et) ; boolean create(MsgOpenAccess et) ;
@CacheEvict(value="msgopenaccess",allEntries=true)
void createBatch(List<MsgOpenAccess> list) ; void createBatch(List<MsgOpenAccess> list) ;
boolean update(MsgOpenAccess et) ; boolean update(MsgOpenAccess et) ;
@CacheEvict(value="msgopenaccess",allEntries=true)
void updateBatch(List<MsgOpenAccess> list) ; void updateBatch(List<MsgOpenAccess> list) ;
boolean remove(String key) ; boolean remove(String key) ;
@CacheEvict(value="msgopenaccess",allEntries=true)
void removeBatch(Collection<String> idList) ; void removeBatch(Collection<String> idList) ;
MsgOpenAccess get(String key) ; MsgOpenAccess get(String key) ;
MsgOpenAccess getDraft(MsgOpenAccess et) ; MsgOpenAccess getDraft(MsgOpenAccess et) ;
boolean checkKey(MsgOpenAccess et) ; boolean checkKey(MsgOpenAccess et) ;
boolean save(MsgOpenAccess et) ; boolean save(MsgOpenAccess et) ;
@CacheEvict(value="msgopenaccess",allEntries=true)
void saveBatch(List<MsgOpenAccess> list) ; void saveBatch(List<MsgOpenAccess> list) ;
Page<MsgOpenAccess> searchDefault(MsgOpenAccessSearchContext context) ; Page<MsgOpenAccess> searchDefault(MsgOpenAccessSearchContext context) ;
/** /**
......
ibznotify-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 44c7acfd
<?xml version="1.1" encoding="UTF-8" standalone="no"?> !!!!模版产生代码错误:----
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
----
----
<!--输出实体[MSG_OPEN_ACCESS]数据结构 --> FTL stack trace ("~" means nesting-related):
<changeSet author="a_A_5d9d78509" id="tab-msg_open_access-24-1"> - Failed at: ${dbinst.getUserName()} [in template "CODETEMPL_zh_CN" at line 28, column 24]
<createTable tableName="IBZOPENACCESS"> ----
<column name="ACCESSID" remarks="" type="VARCHAR(100)"> \ No newline at end of file
<constraints primaryKey="true" primaryKeyName="PK_MSG_OPEN_ACCESS_ACCESSID"/>
</column>
<column name="ACCESSNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="OPEN_TYPE" remarks="" type="VARCHAR(100)">
</column>
<column name="ACCESS_KEY" remarks="" type="VARCHAR(100)">
</column>
<column name="SECRET_KEY" remarks="" type="VARCHAR(100)">
</column>
<column name="REGION_ID" remarks="" type="VARCHAR(100)">
</column>
<column name="ACCESS_TOKEN" remarks="" type="VARCHAR(1000)">
</column>
<column name="EXPIRES_TIME" remarks="" type="DATETIME">
</column>
<column name="DISABLED" remarks="" type="INT">
</column>
</createTable>
</changeSet>
<!--输出实体[MSG_TEMPLATE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-msg_template-95-2">
<createTable tableName="IBZMSGTEMPL">
<column name="TID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_MSG_TEMPLATE_TID"/>
</column>
<column name="TEMPLATE_NAME" remarks="" type="VARCHAR(100)">
</column>
<column name="TEMPLATE_TYPE" remarks="" type="VARCHAR(100)">
</column>
<column name="CONTENT" remarks="" type="VARCHAR(4000)">
</column>
<column name="TEMPLATE_ID" remarks="" type="VARCHAR(100)">
</column>
<column name="TEMPLATE_URL" remarks="" type="VARCHAR(1000)">
</column>
<column name="ACCESSID" remarks="" type="VARCHAR(100)">
</column>
<column name="ACCESSNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="OPEN_TYPE" remarks="" type="VARCHAR(100)">
</column>
</createTable>
</changeSet>
<!--输出实体[MSG_OPEN_ACCESS]外键关系 -->
<!--输出实体[MSG_TEMPLATE]外键关系 -->
</databaseChangeLog>
ibznotify-core/src/main/resources/mapper/notify/msgopenaccess/MsgOpenAccessMapper.xml
浏览文件 @ 44c7acfd
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
<select id="selectById" resultMap="MsgOpenAccessResultMap" databaseId="mysql"> <select id="selectById" resultMap="MsgOpenAccessResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`ACCESSID`, t1.`ACCESSNAME`, t1.`ACCESS_KEY`, t1.`ACCESS_TOKEN`, t1.`DISABLED`, t1.`EXPIRES_TIME`, t1.`OPEN_TYPE`, t1.`REGION_ID`, t1.`SECRET_KEY` FROM `IBZOPENACCESS` t1 ) t1 where accessid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.`ACCESSID`, t1.`ACCESSNAME`, t1.`ACCESS_KEY`, t1.`ACCESS_TOKEN`, t1.`DISABLED`, t1.`EXPIRES_TIME`, t1.`OPEN_TYPE`, t1.`REGION_ID`, t1.`SECRET_KEY` FROM `IBZOPENACCESS` t1 ) t1 where accessid=#{id}]]>
</select> </select>
<select id="selectById" resultMap="MsgOpenAccessResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.ACCESSID, t1.ACCESSNAME, t1.ACCESS_KEY, t1.ACCESS_TOKEN, t1.DISABLED, t1.EXPIRES_TIME, t1.OPEN_TYPE, t1.REDIRECT_URI, t1.REGION_ID, t1.SECRET_KEY FROM IBZOPENACCESS t1 ) t1 where accessid=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 --> <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<resultMap id="MsgOpenAccessResultMap" type="cn.ibizlab.core.notify.domain.MsgOpenAccess" autoMapping="true"> <resultMap id="MsgOpenAccessResultMap" type="cn.ibizlab.core.notify.domain.MsgOpenAccess" autoMapping="true">
...@@ -18,6 +21,7 @@ ...@@ -18,6 +21,7 @@
<result property="regionId" column="region_id" /> <result property="regionId" column="region_id" />
<result property="accessToken" column="access_token" /> <result property="accessToken" column="access_token" />
<result property="expiresTime" column="expires_time" /> <result property="expiresTime" column="expires_time" />
<result property="redirectUri" column="redirect_uri" />
</resultMap> </resultMap>
...@@ -37,10 +41,20 @@ ...@@ -37,10 +41,20 @@
<![CDATA[ SELECT t1.`ACCESSID`, t1.`ACCESSNAME`, t1.`ACCESS_KEY`, t1.`ACCESS_TOKEN`, t1.`DISABLED`, t1.`EXPIRES_TIME`, t1.`OPEN_TYPE`, t1.`REGION_ID`, t1.`SECRET_KEY` FROM `IBZOPENACCESS` t1 <![CDATA[ SELECT t1.`ACCESSID`, t1.`ACCESSNAME`, t1.`ACCESS_KEY`, t1.`ACCESS_TOKEN`, t1.`DISABLED`, t1.`EXPIRES_TIME`, t1.`OPEN_TYPE`, t1.`REGION_ID`, t1.`SECRET_KEY` FROM `IBZOPENACCESS` t1
]]> ]]>
</sql> </sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.ACCESSID, t1.ACCESSNAME, t1.ACCESS_KEY, t1.ACCESS_TOKEN, t1.DISABLED, t1.EXPIRES_TIME, t1.OPEN_TYPE, t1.REDIRECT_URI, t1.REGION_ID, t1.SECRET_KEY FROM IBZOPENACCESS t1
]]>
</sql>
<!--数据查询[View]--> <!--数据查询[View]-->
<sql id="View" databaseId="mysql"> <sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`ACCESSID`, t1.`ACCESSNAME`, t1.`ACCESS_KEY`, t1.`ACCESS_TOKEN`, t1.`DISABLED`, t1.`EXPIRES_TIME`, t1.`OPEN_TYPE`, t1.`REGION_ID`, t1.`SECRET_KEY` FROM `IBZOPENACCESS` t1 <![CDATA[ SELECT t1.`ACCESSID`, t1.`ACCESSNAME`, t1.`ACCESS_KEY`, t1.`ACCESS_TOKEN`, t1.`DISABLED`, t1.`EXPIRES_TIME`, t1.`OPEN_TYPE`, t1.`REGION_ID`, t1.`SECRET_KEY` FROM `IBZOPENACCESS` t1
]]> ]]>
</sql> </sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.ACCESSID, t1.ACCESSNAME, t1.ACCESS_KEY, t1.ACCESS_TOKEN, t1.DISABLED, t1.EXPIRES_TIME, t1.OPEN_TYPE, t1.REDIRECT_URI, t1.REGION_ID, t1.SECRET_KEY FROM IBZOPENACCESS t1
]]>
</sql>
</mapper> </mapper>
ibznotify-provider/ibznotify-provider-api/src/main/java/cn/ibizlab/api/dto/MsgOpenAccessDTO.java
浏览文件 @ 44c7acfd
...@@ -97,6 +97,14 @@ public class MsgOpenAccessDTO extends DTOBase implements Serializable { ...@@ -97,6 +97,14 @@ public class MsgOpenAccessDTO extends DTOBase implements Serializable {
@JsonProperty("disabled") @JsonProperty("disabled")
private Integer disabled; private Integer disabled;
/**
* 属性 [REDIRECT_URI]
*
*/
@JSONField(name = "redirect_uri")
@JsonProperty("redirect_uri")
private String redirectUri;
/** /**
* 设置 [ACCESSNAME] * 设置 [ACCESSNAME]
...@@ -162,6 +170,14 @@ public class MsgOpenAccessDTO extends DTOBase implements Serializable { ...@@ -162,6 +170,14 @@ public class MsgOpenAccessDTO extends DTOBase implements Serializable {
this.modify("disabled",disabled); this.modify("disabled",disabled);
} }
/**
* 设置 [REDIRECT_URI]
*/
public void setRedirectUri(String redirectUri){
this.redirectUri = redirectUri ;
this.modify("redirect_uri",redirectUri);
}
} }
ibznotify-util/src/main/resources/application-sys.yml
浏览文件 @ 44c7acfd
...@@ -22,9 +22,9 @@ spring: ...@@ -22,9 +22,9 @@ spring:
max-file-size: 100MB max-file-size: 100MB
max-request-size: 100MB max-request-size: 100MB
datasource: datasource:
username: a_A_5d9d78509 username: root
password: '@6dEfb3@' password: 'root'
url: jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true url: jdbc:mysql://127.0.0.1:3306/ibznotify?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
filters: stat,wall,log4j2 filters: stat,wall,log4j2
#配置初始化大小/最小/最大 #配置初始化大小/最小/最大
...@@ -45,7 +45,7 @@ spring: ...@@ -45,7 +45,7 @@ spring:
pool-prepared-statements: false pool-prepared-statements: false
max-pool-prepared-statement-per-connection-size: 20 max-pool-prepared-statement-per-connection-size: 20
isSyncDBSchema: false isSyncDBSchema: false
defaultSchema: a_A_5d9d78509 defaultSchema: root
conf: classpath:liquibase/master.xml conf: classpath:liquibase/master.xml
#Mybatis-plus配置 #Mybatis-plus配置
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或