v1.3.1 FIX
1、验证增强，增加算术验证码支持 2、修复新增用户时报错 3、修复操作日志报错 4、mybatis-jpa-extra升级到v2.0
This commit is contained in:
shimingxy
@@ -199,7 +199,7 @@ public class UserInfoController {
|
||||
* @return
|
||||
*/
|
||||
@ResponseBody
|
||||
@RequestMapping(value="/delete",method=RequestMethod.DELETE)
|
||||
@RequestMapping(value="/delete")
|
||||
public Message deleteUsersById(@RequestParam("id") String id) {
|
||||
_logger.debug(id);
|
||||
if(userInfoService.batchDelete(StringUtils.string2List(id, ","))) {
|
||||
|
||||
@@ -51,6 +51,8 @@ config.characterencoding.tocharset=UTF-8
|
||||
############################################################################
|
||||
# Login
|
||||
config.login.captcha=false
|
||||
#text or arithmetic
|
||||
config.login.captcha.type=text
|
||||
config.login.socialAuth=true
|
||||
config.login.msad.kerberos=false
|
||||
# End Login
|
||||
|
||||
@@ -62,6 +62,8 @@
|
||||
<!--<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">-->
|
||||
<bean id="sqlSessionFactory" class="org.apache.mybatis.jpa.MyBatisSessionFactoryBean">
|
||||
<property name="dataSource" ref="dataSource" />
|
||||
<property name="dialect" value="mysql" />
|
||||
<property name="timeout" value="30" />
|
||||
<property name="transactionFactory">
|
||||
<bean class="org.apache.ibatis.transaction.managed.ManagedTransactionFactory" />
|
||||
</property>
|
||||
@@ -70,32 +72,13 @@
|
||||
org.maxkey.domain,
|
||||
org.maxkey.domain.apps,
|
||||
" />
|
||||
<property name="timeout" value="30" />
|
||||
<property name="mapperLocations" value="classpath*:org/maxkey/dao/persistence/xml/#{dataSoruceConfig.database}/*.xml" />
|
||||
<property name="interceptors">
|
||||
<list>
|
||||
<ref bean="StatementHandlerInterceptor"/>
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="StatementHandlerInterceptor" class="org.apache.mybatis.jpa.StatementHandlerInterceptor">
|
||||
<!-- dialect need bean dialect
|
||||
<property name="dialect">
|
||||
<bean id="dialect" class="org.apache.mybatis.jpa.dialect.MySQLDialect"/>
|
||||
</property>
|
||||
-->
|
||||
<!-- from database type -->
|
||||
<property name="dialectString" value="#{dataSoruceConfig.dialect}"/>
|
||||
|
||||
</bean>
|
||||
|
||||
|
||||
<bean id="sqlSession" class="org.mybatis.spring.SqlSessionTemplate">
|
||||
<constructor-arg index="0" ref="sqlSessionFactory" />
|
||||
</bean>
|
||||
|
||||
|
||||
<!-- scan for mappers and let them be autowired -->
|
||||
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
|
||||
<property name="basePackage"
|
||||
|
||||
@@ -117,24 +117,23 @@
|
||||
|
||||
<!-- Captcha Producer Config -->
|
||||
<bean id="captchaProducer" class="com.google.code.kaptcha.impl.DefaultKaptcha">
|
||||
<property name="config">
|
||||
<bean class="com.google.code.kaptcha.util.Config">
|
||||
<constructor-arg type="java.util.Properties">
|
||||
<props>
|
||||
<prop key="kaptcha.image.width">70</prop>
|
||||
<prop key="kaptcha.image.height">25</prop>
|
||||
<prop key="kaptcha.border">no</prop>
|
||||
<prop key="kaptcha.obscurificator.impl">com.google.code.kaptcha.impl.ShadowGimpy</prop>
|
||||
<prop key="kaptcha.textproducer.font.size">23</prop>
|
||||
<prop key="kaptcha.textproducer.char.string">0123456789</prop>
|
||||
<prop key="kaptcha.textproducer.char.length">4</prop>
|
||||
<prop key="kaptcha.noise.impl">com.google.code.kaptcha.impl.NoNoise</prop>
|
||||
<!-- <prop key="kaptcha.noise.color">white</prop>
|
||||
-->
|
||||
</props>
|
||||
</constructor-arg>
|
||||
</bean>
|
||||
</property>
|
||||
<property name="config" >
|
||||
<bean id="kaptchaConfig" class="com.google.code.kaptcha.util.Config">
|
||||
<constructor-arg type="java.util.Properties">
|
||||
<props>
|
||||
<prop key="kaptcha.image.width">80</prop>
|
||||
<prop key="kaptcha.image.height">25</prop>
|
||||
<prop key="kaptcha.border">no</prop>
|
||||
<prop key="kaptcha.obscurificator.impl">com.google.code.kaptcha.impl.ShadowGimpy</prop>
|
||||
<prop key="kaptcha.textproducer.font.size">23</prop>
|
||||
<prop key="kaptcha.textproducer.char.string">0123456789</prop>
|
||||
<prop key="kaptcha.textproducer.char.length">4</prop>
|
||||
<prop key="kaptcha.noise.impl">com.google.code.kaptcha.impl.NoNoise</prop>
|
||||
<!-- <prop key="kaptcha.noise.color">white</prop> -->
|
||||
</props>
|
||||
</constructor-arg>
|
||||
</bean>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="savedRequestSuccessHandler" class="org.maxkey.authn.SavedRequestAwareAuthenticationSuccessHandler"> </bean>
|
||||
|
||||
@@ -51,11 +51,11 @@ $(function () {
|
||||
</tr>
|
||||
<tr>
|
||||
<td > <@locale code="org.name" />：</td>
|
||||
<td><input type="text" id="name" name="name" class="form-control"/></td>
|
||||
<td><input type="text" id="name" name="name" required="" class="form-control"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td > <@locale code="org.fullname" />：</td>
|
||||
<td><input type="text" id="fullName" name="fullName" class="form-control"/></td>
|
||||
<td><input type="text" id="fullName" name="fullName" required="" class="form-control"/></td>
|
||||
</tr>
|
||||
<tr >
|
||||
<td > <@locale code="org.xpath" /> ：
|
||||
|
||||
@@ -51,11 +51,11 @@
|
||||
<td style="width:15%;"><@locale code="userinfo.username" />：</td>
|
||||
<td style="width:35%;">
|
||||
<input type="hidden" id="id" name="id" value=""/>
|
||||
<input class="form-control" type="text" id="username" name="username" title="" value=""/>
|
||||
<input class="form-control" type="text" required="" id="username" name="username" title="" value=""/>
|
||||
</td>
|
||||
<td style="width:15%;"><@locale code="login.text.password" />：</td>
|
||||
<td style="width:35%;">
|
||||
<input class="form-control" type="password" id="password" name="password" title="" value=""/>
|
||||
<input class="form-control" type="password" required="" id="password" name="password" title="" value=""/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -88,7 +88,7 @@
|
||||
<tr>
|
||||
<td><@locale code="userinfo.displayName" />：</td>
|
||||
<td>
|
||||
<input class="form-control" type="text" id="displayName" name="displayName" title="" value=""/>
|
||||
<input class="form-control" type="text" required="" id="displayName" name="displayName" title="" value=""/>
|
||||
</td>
|
||||
<td rowspan="4"><@locale code="userinfo.picture" />：</td>
|
||||
<td rowspan="4">
|
||||
|
||||
Reference in New Issue
Block a user