Merge remote-tracking branch 'origin/master'

ipu-rest-demo/readme.md

@@ -28,3 +28,5 @@ service+dao后续可以移植到dubbo服务中。
6.1 异常：request part 'file' is not present
原因：指定了上传文件的处理器CommonsMultipartResolver。
解决方法：注释掉，不指定文件处理器即可。
6.2 请求模拟器报错：[服务请求错误]，有数据返回，但格式不正常。
解决方法：Controller方法中@ResponseBody

ipu-rest-demo/src/main/java/com/ai/ipu/server/demo/control/db/DbSqlMgmtController.java

@@ -9,8 +9,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.ipu.database.dao.IpuDaoManager;
import com.ai.ipu.sql.mgmt.SqlMgmtDao;
import com.ai.ipu.sql.mgmt.ISqlMgmtDao;
import com.ai.ipu.sql.mgmt.SqlManager;
import com.ai.ipu.sql.mgmt.SqlMgmtDaoFactory;
@Controller
@RequestMapping("/db/mgmt")
@@ -18,15 +19,38 @@ public class DbSqlMgmtController {
    private String connName = "test";
    
    @ResponseBody
    @RequestMapping("/select")
    public JMap executeSqlByRepository(JMap param) throws Exception {
    @RequestMapping("/selectByFile")
    public JMap executeSqlByFileRepository(JMap param) throws Exception {
        // TODO Auto-generated method stub
        JMap params = new JsonMap();
        params.put("id", 1);
        SqlMgmtDao dao = IpuDaoManager.takeDao(SqlMgmtDao.class, connName);
        params.put("id", param.getInt("id", 1));
        ISqlMgmtDao dao = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
        List<Map<String, Object>> dataResult = dao.executeSelect("com.ai.ipu.user.user", "select", params);
        JMap result = new JsonMap();
        result.put("result", dataResult);
        return result;
    }
    
    @ResponseBody
    @RequestMapping("/selectByDb")
    public JMap executeSqlByDbRepository(JMap param) throws Exception {
        // TODO Auto-generated method stub
        JMap params = new JsonMap();
        params.put("id", param.getInt("id", 1));
        ISqlMgmtDao dao = SqlMgmtDaoFactory.createDbSqlMgmtDao(connName);
        List<Map<String, Object>> dataResult = dao.executeSelect("com.ai.ipu.UserMapper", "select", params);
        JMap result = new JsonMap();
        result.put("result", dataResult);
        return result;
    }
    
    @ResponseBody
    @RequestMapping("/refresh")
    public JMap refreshSqlRepository(JMap param) throws Exception {
        // TODO Auto-generated method stub
        JMap result = new JsonMap();
        SqlManager.refreshSqlCache();
        result.put("msg", "刷新成功");
        return result;
    }
}

ipu-rest-demo/src/main/resources/sql/com/ai/ipu/user/user.xml

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<sqls>
	<sql name="select">
		<![cdata[
		<select id="select" resultType="java.util.Map" useCache="true">
	        select id, name from user 
	        <where>
	            <if test="id == 1">
	                id = #{id}
	            </if>
	        </where>
	        order by name
		</select>
		]]>
	</sql>
<sqls>

ipu-server-demo/src/main/java/com/ai/ipu/server/bean/LoginBean.java

@@ -79,7 +79,7 @@ public class LoginBean extends IpuAppBean {
	 */
	public IData getUserInfoByUserId(IData param) throws Exception{
	    IData resultData = new DataMap();
	    UserDao userDao = new UserDao("mysqlName");
	    UserDao userDao = new UserDao("test");
	    IData userObj = userDao.queryUserListByEmail(param);
	    resultData.put("user", userObj);
	    return resultData;

ipu-server-demo/src/main/java/com/ai/ipu/server/dao/UserDao.java

@@ -1,9 +1,12 @@
package com.ai.ipu.server.dao;
import com.ai.ipu.server.db.dao.impl.BaseDAO;
import java.util.Map;
import com.ai.ipu.database.dao.impl.AbstractBizDao;
import com.ailk.common.data.IData;
import com.ailk.common.data.impl.DataMap;
public class UserDao extends BaseDAO
public class UserDao extends AbstractBizDao
{
    public UserDao(String connName) throws Exception
    {
@@ -15,8 +18,11 @@ public class UserDao extends BaseDAO
     */
    public IData queryUserListByEmail(IData param) throws Exception
    {
        String sql = " SELECT * FROM user WHERE email = :USER_EMAIL";
        return this.queryList(sql, param).first();
    	IData resultData = new DataMap();
        String sql = " SELECT * FROM tab_user_info WHERE USER_EMAIL = #{USER_EMAIL}";
        Map result =  this.getBasicDao().executeSelectOne(sql, param);
        resultData.putAll(result);
        return resultData;
    }
    /**
@@ -25,7 +31,7 @@ public class UserDao extends BaseDAO
    public void insertUsers(IData param) throws Exception
    {
        String sql = "INSERT INTO user (email, encrypted_password, created_at, updated_at, name, state) VALUES(:email, :encrypted_password, :created_at, :updated_at, :name, :state)";
        this.executeUpdate(sql, param);
        this.getBasicDao().executeUpdate(sql, param);
    }
}

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

@@ -18,7 +18,7 @@
			<transactionManager type="JDBC" />
			<dataSource type="com.ai.ipu.database.datasource.C3P0DataSourceFactory">
				<property name="driverClass" value="com.mysql.jdbc.Driver" />
				<property name="jdbcUrl" value="jdbc:mysql://121.42.183.206:3307/test" />
				<property name="jdbcUrl" value="jdbc:mysql://121.42.183.206:3307/test_app_mgmt" />
				<property name="user" value="ipu" />
				<property name="password" value="ipumysql" />
				<!-- 连接池用完时,等待获取新连接的时间 (毫秒) -->

ipu-server-demo/src/main/resources/server-data.xml

@@ -3,5 +3,6 @@
    <action name="Login.init" class="com.ai.ipu.server.bean.LoginBean" method="init" verify="false"></action>
    <action name="Login.refreshVerifyCode" class="com.ai.ipu.server.bean.LoginBean" method="refreshVerifyCode" verify="false"></action>
    <action name="Login.doLogin" class="com.ai.ipu.server.bean.LoginBean" method="doLogin" verify="false"></action>
    <action name="Login.getUserInfoByUserId" class="com.ai.ipu.server.bean.LoginBean" method="getUserInfoByUserId" verify="false"></action>
    <action name="Index.getMenuData" class="com.ai.ipu.server.bean.IndexBean" method="getMenuData" verify="false"></action>
</datas>