Skip to content

R
roncoo-education

roncoo / roncoo-education
大约 1 年 前同步成功

通知 146
Star 5
Fork 0
R
roncoo-education

体验新版 GitCode，发现更多精彩内容 >>

提交 90b07e0e 编写于 作者: 1 1074760496
浏览文件
操作

sys配置文件表去掉多余字段aliyun_oas_vault

上级 7afe3b77
隐藏空白更改
内联 并排
Showing with 56 addition and 191 deletion
roncoo-education-system/roncoo-education-system-common/src/main/java/com/roncoo/education/system/common/bean/qo/SysQO.java
浏览文件 @ 90b07e0e
......@@ -97,10 +97,6 @@ public class SysQO implements Serializable {
* oss_bucket
*/
private String aliyunOssBucket;
/**
* oas_vault
*/
private String aliyunOasVault;
/**
* pay_url
*/
......
roncoo-education-system/roncoo-education-system-common/src/main/java/com/roncoo/education/system/common/bean/vo/SysVO.java
浏览文件 @ 90b07e0e
......@@ -89,10 +89,6 @@ public class SysVO implements Serializable {
* oss_bucket
*/
private String aliyunOssBucket;
/**
* oas_vault
*/
private String aliyunOasVault;
/**
* pay_url
*/
......
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/dao/impl/mapper/entity/Sys.java
浏览文件 @ 90b07e0e
......@@ -34,8 +34,6 @@ public class Sys implements Serializable {
private String aliyunOssBucket;
private String aliyunOasVault;
private Integer payType;
private String payUrl;
......@@ -172,14 +170,6 @@ public class Sys implements Serializable {
this.aliyunOssBucket = aliyunOssBucket == null ? null : aliyunOssBucket.trim();
}
public String getAliyunOasVault() {
return aliyunOasVault;
}
public void setAliyunOasVault(String aliyunOasVault) {
this.aliyunOasVault = aliyunOasVault == null ? null : aliyunOasVault.trim();
}
public Integer getPayType() {
return payType;
}
......@@ -257,7 +247,6 @@ public class Sys implements Serializable {
sb.append(", aliyunAccessKeySecret=").append(aliyunAccessKeySecret);
sb.append(", aliyunOssUrl=").append(aliyunOssUrl);
sb.append(", aliyunOssBucket=").append(aliyunOssBucket);
sb.append(", aliyunOasVault=").append(aliyunOasVault);
sb.append(", payType=").append(payType);
sb.append(", payUrl=").append(payUrl);
sb.append(", payKey=").append(payKey);
......
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/dao/impl/mapper/entity/SysExample.java
浏览文件 @ 90b07e0e
......@@ -1105,76 +1105,6 @@ public class SysExample {
return (Criteria) this;
}
public Criteria andAliyunOasVaultIsNull() {
addCriterion("aliyun_oas_vault is null");
return (Criteria) this;
}
public Criteria andAliyunOasVaultIsNotNull() {
addCriterion("aliyun_oas_vault is not null");
return (Criteria) this;
}
public Criteria andAliyunOasVaultEqualTo(String value) {
addCriterion("aliyun_oas_vault =", value, "aliyunOasVault");
return (Criteria) this;
}
public Criteria andAliyunOasVaultNotEqualTo(String value) {
addCriterion("aliyun_oas_vault <>", value, "aliyunOasVault");
return (Criteria) this;
}
public Criteria andAliyunOasVaultGreaterThan(String value) {
addCriterion("aliyun_oas_vault >", value, "aliyunOasVault");
return (Criteria) this;
}
public Criteria andAliyunOasVaultGreaterThanOrEqualTo(String value) {
addCriterion("aliyun_oas_vault >=", value, "aliyunOasVault");
return (Criteria) this;
}
public Criteria andAliyunOasVaultLessThan(String value) {
addCriterion("aliyun_oas_vault <", value, "aliyunOasVault");
return (Criteria) this;
}
public Criteria andAliyunOasVaultLessThanOrEqualTo(String value) {
addCriterion("aliyun_oas_vault <=", value, "aliyunOasVault");
return (Criteria) this;
}
public Criteria andAliyunOasVaultLike(String value) {
addCriterion("aliyun_oas_vault like", value, "aliyunOasVault");
return (Criteria) this;
}
public Criteria andAliyunOasVaultNotLike(String value) {
addCriterion("aliyun_oas_vault not like", value, "aliyunOasVault");
return (Criteria) this;
}
public Criteria andAliyunOasVaultIn(List<String> values) {
addCriterion("aliyun_oas_vault in", values, "aliyunOasVault");
return (Criteria) this;
}
public Criteria andAliyunOasVaultNotIn(List<String> values) {
addCriterion("aliyun_oas_vault not in", values, "aliyunOasVault");
return (Criteria) this;
}
public Criteria andAliyunOasVaultBetween(String value1, String value2) {
addCriterion("aliyun_oas_vault between", value1, value2, "aliyunOasVault");
return (Criteria) this;
}
public Criteria andAliyunOasVaultNotBetween(String value1, String value2) {
addCriterion("aliyun_oas_vault not between", value1, value2, "aliyunOasVault");
return (Criteria) this;
}
public Criteria andPayTypeIsNull() {
addCriterion("pay_type is null");
return (Criteria) this;
......
roncoo-education-system/roncoo-education-system-service/src/main/resources/mybatis/SysMapper.xml
浏览文件 @ 90b07e0e
......@@ -17,7 +17,6 @@
<result column="aliyun_access_key_secret" property="aliyunAccessKeySecret" jdbcType="VARCHAR" />
<result column="aliyun_oss_url" property="aliyunOssUrl" jdbcType="VARCHAR" />
<result column="aliyun_oss_bucket" property="aliyunOssBucket" jdbcType="VARCHAR" />
<result column="aliyun_oas_vault" property="aliyunOasVault" jdbcType="VARCHAR" />
<result column="pay_type" property="payType" jdbcType="TINYINT" />
<result column="pay_url" property="payUrl" jdbcType="VARCHAR" />
<result column="pay_key" property="payKey" jdbcType="VARCHAR" />
......@@ -87,8 +86,8 @@
<sql id="Base_Column_List" >
id, gmt_create, gmt_modified, status_id, sort, video_type, polyv_useid, polyv_writetoken,
polyv_readtoken, polyv_secretkey, file_type, aliyun_access_key_id, aliyun_access_key_secret,
aliyun_oss_url, aliyun_oss_bucket, aliyun_oas_vault, pay_type, pay_url, pay_key,
pay_secret, notify_url, sms_code, sign_name
aliyun_oss_url, aliyun_oss_bucket, pay_type, pay_url, pay_key, pay_secret, notify_url,
sms_code, sign_name
</sql>
<select id="selectByExample" resultMap="BaseResultMap" parameterType="com.roncoo.education.system.service.dao.impl.mapper.entity.SysExample" >
select
......@@ -129,17 +128,17 @@
polyv_useid, polyv_writetoken, polyv_readtoken,
polyv_secretkey, file_type, aliyun_access_key_id,
aliyun_access_key_secret, aliyun_oss_url, aliyun_oss_bucket,
aliyun_oas_vault, pay_type, pay_url,
pay_key, pay_secret, notify_url,
sms_code, sign_name)
pay_type, pay_url, pay_key,
pay_secret, notify_url, sms_code,
sign_name)
values (#{id,jdbcType=BIGINT}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP},
#{statusId,jdbcType=TINYINT}, #{sort,jdbcType=INTEGER}, #{videoType,jdbcType=TINYINT},
#{polyvUseid,jdbcType=VARCHAR}, #{polyvWritetoken,jdbcType=VARCHAR}, #{polyvReadtoken,jdbcType=VARCHAR},
#{polyvSecretkey,jdbcType=VARCHAR}, #{fileType,jdbcType=TINYINT}, #{aliyunAccessKeyId,jdbcType=VARCHAR},
#{aliyunAccessKeySecret,jdbcType=VARCHAR}, #{aliyunOssUrl,jdbcType=VARCHAR}, #{aliyunOssBucket,jdbcType=VARCHAR},
#{aliyunOasVault,jdbcType=VARCHAR}, #{payType,jdbcType=TINYINT}, #{payUrl,jdbcType=VARCHAR},
#{payKey,jdbcType=VARCHAR}, #{paySecret,jdbcType=VARCHAR}, #{notifyUrl,jdbcType=VARCHAR},
#{smsCode,jdbcType=VARCHAR}, #{signName,jdbcType=VARCHAR})
#{payType,jdbcType=TINYINT}, #{payUrl,jdbcType=VARCHAR}, #{payKey,jdbcType=VARCHAR},
#{paySecret,jdbcType=VARCHAR}, #{notifyUrl,jdbcType=VARCHAR}, #{smsCode,jdbcType=VARCHAR},
#{signName,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.roncoo.education.system.service.dao.impl.mapper.entity.Sys" >
insert into sys
......@@ -189,9 +188,6 @@
<if test="aliyunOssBucket != null" >
aliyun_oss_bucket,
</if>
<if test="aliyunOasVault != null" >
aliyun_oas_vault,
</if>
<if test="payType != null" >
pay_type,
</if>
......@@ -260,9 +256,6 @@
<if test="aliyunOssBucket != null" >
#{aliyunOssBucket,jdbcType=VARCHAR},
</if>
<if test="aliyunOasVault != null" >
#{aliyunOasVault,jdbcType=VARCHAR},
</if>
<if test="payType != null" >
#{payType,jdbcType=TINYINT},
</if>
......@@ -340,9 +333,6 @@
<if test="record.aliyunOssBucket != null" >
aliyun_oss_bucket = #{record.aliyunOssBucket,jdbcType=VARCHAR},
</if>
<if test="record.aliyunOasVault != null" >
aliyun_oas_vault = #{record.aliyunOasVault,jdbcType=VARCHAR},
</if>
<if test="record.payType != null" >
pay_type = #{record.payType,jdbcType=TINYINT},
</if>
......@@ -386,7 +376,6 @@
aliyun_access_key_secret = #{record.aliyunAccessKeySecret,jdbcType=VARCHAR},
aliyun_oss_url = #{record.aliyunOssUrl,jdbcType=VARCHAR},
aliyun_oss_bucket = #{record.aliyunOssBucket,jdbcType=VARCHAR},
aliyun_oas_vault = #{record.aliyunOasVault,jdbcType=VARCHAR},
pay_type = #{record.payType,jdbcType=TINYINT},
pay_url = #{record.payUrl,jdbcType=VARCHAR},
pay_key = #{record.payKey,jdbcType=VARCHAR},
......@@ -443,9 +432,6 @@
<if test="aliyunOssBucket != null" >
aliyun_oss_bucket = #{aliyunOssBucket,jdbcType=VARCHAR},
</if>
<if test="aliyunOasVault != null" >
aliyun_oas_vault = #{aliyunOasVault,jdbcType=VARCHAR},
</if>
<if test="payType != null" >
pay_type = #{payType,jdbcType=TINYINT},
</if>
......@@ -486,7 +472,6 @@
aliyun_access_key_secret = #{aliyunAccessKeySecret,jdbcType=VARCHAR},
aliyun_oss_url = #{aliyunOssUrl,jdbcType=VARCHAR},
aliyun_oss_bucket = #{aliyunOssBucket,jdbcType=VARCHAR},
aliyun_oas_vault = #{aliyunOasVault,jdbcType=VARCHAR},
pay_type = #{payType,jdbcType=TINYINT},
pay_url = #{payUrl,jdbcType=VARCHAR},
pay_key = #{payKey,jdbcType=VARCHAR},
......
roncoo-education-web-boss/src/main/resources/templates/system/sys/set.ftl
浏览文件 @ 90b07e0e
......@@ -22,20 +22,16 @@
<br />
<div class="form-group">
<label class="control-label x150">useid：</label>
<input type="text" name="polyvUseid" value="<#if bean??>${bean.polyvUseid!}</#if>" placeholder="useid" size="20">
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<label class="control-label x120">secretkey：</label>
<input type="text" name="polyvSecretkey" value="<#if bean??>${bean.polyvSecretkey!}</#if>" placeholder="secretkey" size="20">
<input type="text" name="polyvUseid" value="<#if bean??>${bean.polyvUseid!}</#if>" placeholder="useid" size="40">
<label class="control-label x150">secretkey：</label>
<input type="text" name="polyvSecretkey" value="<#if bean??>${bean.polyvSecretkey!}</#if>" placeholder="secretkey" size="40">
</div>
<br />
<div class="form-group">
<label class="control-label x150">readtoken：</label>
<input type="text" name="polyvReadtoken" value="<#if bean??>${bean.polyvReadtoken!}</#if>" placeholder="readtoken" size="57.5">
</div>
<br />
<div class="form-group">
<label class="control-label x150">writetoken：</label>
<input type="text" name="polyvWritetoken" value="<#if bean??>${bean.polyvWritetoken!}</#if>" placeholder="writetoken" size="57.5">
<input type="text" name="polyvReadtoken" value="<#if bean??>${bean.polyvReadtoken!}</#if>" placeholder="readtoken" size="40">
<label class="control-label x150">writetoken：</label>
<input type="text" name="polyvWritetoken" value="<#if bean??>${bean.polyvWritetoken!}</#if>" placeholder="writetoken" size="40">
</div>
</fieldset>
......@@ -56,33 +52,25 @@
<br />
<div class="form-group">
<label class="control-label x150">accessKeyId：</label>
<input type="text" name="aliyunAccessKeyId" value="<#if bean??>${bean.aliyunAccessKeyId!}</#if>" placeholder="accessKeyId" size="20">
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<label class="control-label x120">ossBucket：</label>
<input type="text" name="aliyunOssBucket" value="<#if bean??>${bean.aliyunOssBucket!}</#if>" placeholder="accessKeySecret" size="20">
</div>
<br />
<div class="form-group">
<label class="control-label x150">smsCode：</label>
<input type="text" name="smsCode" value="<#if bean??>${bean.smsCode!}</#if>" placeholder="smsCode" size="20">
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<label class="control-label x120">短信签名：</label>
<input type="text" name="signName" value="<#if bean??>${bean.signName!}</#if>" placeholder="signName" size="20">
</div>
<br />
<div class="form-group">
<label class="control-label x150">oasVault：</label>
<input type="text" name="aliyunOasVault" value="<#if bean??>${bean.aliyunOasVault!}</#if>" placeholder="accessKeyId" size="20">
<input type="text" name="aliyunAccessKeyId" value="<#if bean??>${bean.aliyunAccessKeyId!}</#if>" placeholder="accessKeyId" size="40">
<label class="control-label x150">accessKeySecret：</label>
<input type="text" name="aliyunAccessKeySecret" value="<#if bean??>${bean.aliyunAccessKeySecret!}</#if>" placeholder="accessKeySecret" size="40">
</div>
<br />
<div class="form-group">
<label class="control-label x150">accessKeySecret：</label>
<input type="text" name="aliyunAccessKeySecret" value="<#if bean??>${bean.aliyunAccessKeySecret!}</#if>" placeholder="accessKeySecret" size="57.5">
<label class="control-label x150">ossUrl：</label>
<input type="text" name="aliyunOssUrl" value="<#if bean??>${bean.aliyunOssUrl!}</#if>" placeholder="accessKeyId" size="40">
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<label class="control-label x120">ossBucket：</label>
<input type="text" name="aliyunOssBucket" value="<#if bean??>${bean.aliyunOssBucket!}</#if>" placeholder="accessKeySecret" size="40">
</div>
<br />
<div class="form-group">
<label class="control-label x150">ossUrl：</label>
<input type="text" name="aliyunOssUrl" value="<#if bean??>${bean.aliyunOssUrl!}</#if>" placeholder="accessKeyId" size="57.5">
<label class="control-label x150">smsCode：</label>
<input type="text" name="smsCode" value="<#if bean??>${bean.smsCode!}</#if>" placeholder="smsCode" size="40">
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<label class="control-label x120">短信签名：</label>
<input type="text" name="signName" value="<#if bean??>${bean.signName!}</#if>" placeholder="signName" size="40">
</div>
<br />
</fieldset>
......@@ -103,22 +91,16 @@
<br />
<div class="form-group">
<label class="control-label x150">payKey：</label>
<input type="text" name="payKey" value="<#if bean??>${bean.payKey!}</#if>" placeholder="roncooKey" size="57.5">
</div>
<br />
<div class="form-group">
<input type="text" name="payKey" value="<#if bean??>${bean.payKey!}</#if>" placeholder="roncooKey" size="40">
<label class="control-label x150">paySecret：</label>
<input type="text" name="paySecret" value="<#if bean??>${bean.paySecret!}</#if>" placeholder="roncooSecret" size="57.5">
<input type="text" name="paySecret" value="<#if bean??>${bean.paySecret!}</#if>" placeholder="roncooSecret" size="40">
</div>
<br />
<div class="form-group">
<label class="control-label x150">payUrl：</label>
<input type="text" name="payUrl" value="<#if bean??>${bean.payUrl!}</#if>" placeholder="roncooKey" size="57.5">
</div>
<br />
<div class="form-group">
<label class="control-label x150">notifyUrl：</label>
<input type="text" name="notifyUrl" value="<#if bean??>${bean.notifyUrl!}</#if>" placeholder="roncooSecret" size="57.5">
<label class="control-label x150">支付请求：</label>
<input type="text" name="payUrl" value="<#if bean??>${bean.payUrl!}</#if>" placeholder="payUrl" size="40">
<label class="control-label x150">回调地址：</label>
<input type="text" name="notifyUrl" value="<#if bean??>${bean.notifyUrl!}</#if>" placeholder="notifyUrl" size="40">
</div>
</fieldset>
<#else>
......@@ -138,20 +120,16 @@
<br />
<div class="form-group">
<label class="control-label x150">useid：</label>
<input type="text" name="polyvUseid" value="********" placeholder="useid" size="20">
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<label class="control-label x120">secretkey：</label>
<input type="text" name="polyvSecretkey" value="********" placeholder="secretkey" size="20">
<input type="text" name="polyvUseid" value="********" placeholder="useid" size="40">
<label class="control-label x150">secretkey：</label>
<input type="text" name="polyvSecretkey" value="********" placeholder="secretkey" size="40">
</div>
<br />
<div class="form-group">
<label class="control-label x150">readtoken：</label>
<input type="text" name="polyvReadtoken" value="********" placeholder="readtoken" size="57.5">
</div>
<br />
<div class="form-group">
<label class="control-label x150">writetoken：</label>
<input type="text" name="polyvWritetoken" value="********" placeholder="writetoken" size="57.5">
<input type="text" name="polyvReadtoken" value="********" placeholder="readtoken" size="40">
<label class="control-label x150">writetoken：</label>
<input type="text" name="polyvWritetoken" value="********" placeholder="writetoken" size="40">
</div>
</fieldset>
......@@ -171,27 +149,24 @@
<br />
<div class="form-group">
<label class="control-label x150">accessKeyId：</label>
<input type="text" name="aliyunAccessKeyId" value="********" placeholder="accessKeyId" size="20">
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<label class="control-label x120">ossBucket：</label>
<input type="text" name="aliyunOssBucket" value="********" placeholder="accessKeySecret" size="20">
</div>
<br />
<div class="form-group">
<label class="control-label x150">oasVault：</label>
<input type="text" name="aliyunOasVault" value="********" placeholder="accessKeyId" size="20">
<input type="text" name="aliyunAccessKeyId" value="********" placeholder="accessKeyId" size="40">
<label class="control-label x150">accessKeySecret：</label>
<input type="text" name="aliyunAccessKeySecret" value="********" placeholder="accessKeySecret" size="40">
</div>
<br />
<div class="form-group">
<label class="control-label x150">accessKeySecret：</label>
<input type="text" name="aliyunAccessKeySecret" value="********" placeholder="accessKeySecret" size="57.5">
<label class="control-label x150">ossUrl：</label>
<input type="text" name="aliyunOssUrl" value="********" placeholder="ossUrl" size="40">
<label class="control-label x150">ossBucket：</label>
<input type="text" name="aliyunOssBucket" value="********" placeholder="ossBucket" size="40">
</div>
<br />
<div class="form-group">
<label class="control-label x150">ossUrl：</label>
<input type="text" name="aliyunOssUrl" value="********" placeholder="accessKeyId" size="57.5">
<label class="control-label x150">smsCode：</label>
<input type="text" name="smsCode" value="********" placeholder="smsCode" size="40">
<label class="control-label x150">短信签名：</label>
<input type="text" name="signName" value="********" placeholder="signName" size="40">
</div>
<br />
</fieldset>
<fieldset>
......@@ -210,22 +185,16 @@
<br />
<div class="form-group">
<label class="control-label x150">payKey：</label>
<input type="text" name="payKey" value="********" placeholder="roncooKey" size="57.5">
</div>
<br />
<div class="form-group">
<input type="text" name="payKey" value="********" placeholder="roncooKey" size="40">
<label class="control-label x150">paySecret：</label>
<input type="text" name="paySecret" value="********" placeholder="roncooSecret" size="57.5">
</div>
<br />
<div class="form-group">
<label class="control-label x150">payUrl：</label>
<input type="text" name="payUrl" value="********" placeholder="roncooKey" size="57.5">
<input type="text" name="paySecret" value="********" placeholder="roncooSecret" size="40">
</div>
<br />
<div class="form-group">
<label class="control-label x150">notifyUrl：</label>
<input type="text" name="notifyUrl" value="********" placeholder="roncooSecret" size="57.5">
<label class="control-label x150">支付请求：</label>
<input type="text" name="payUrl" value="********" placeholder="payUrl" size="40">
<label class="control-label x150">回调地址：</label>
<input type="text" name="notifyUrl" value="********" placeholder="notifyUrl" size="40">
</div>
</fieldset>
</#if>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或