@IPU_FIXBUG_2021@代码优化

ipu-rest-demo/pom.xml

@@ -117,6 +117,11 @@
		    <artifactId>guava</artifactId>
		    <version>${google.plugin}</version>
		</dependency>
				<dependency>
			<groupId>mysql</groupId>
			<artifactId>mysql-connector-java</artifactId>
			<version>8.0.15</version>
		</dependency>
	</dependencies>
	<build>
@@ -125,6 +130,14 @@
			<plugin>
				<groupId>org.springframework.boot</groupId>
				<artifactId>spring-boot-maven-plugin</artifactId>
				<version>2.4.5</version>
				
				    <configuration>
      <image>
        <name>megale/${project.artifactId}:${project.version}</name>
      </image>
    </configuration>
				
			</plugin>
			<!-- 添加docker镜像功能 -->
			<plugin>

ipu-rest-demo/src/main/java/com/ai/ipu/server/demo/control/cache/RedisController.java

@@ -68,7 +68,7 @@ public class RedisController {
			LOGGER.debug(result.getString("result"));				
		} catch (Exception e)
		{
			String errorMsg = "从redis中获取" + key + "错误：" + e.getMessage();
			String errorMsg = "从redis中获取" + key + "错误：" + e.toString();
			LOGGER.error(errorMsg);
			result.put("result", errorMsg);
		}finally {
@@ -94,7 +94,7 @@ public class RedisController {
			LOGGER.debug(result.getString("result"));		
		} catch (Exception e)
		{
			String errorMsg = "从redis中获取" + key + "错误：" + e.getMessage();
			String errorMsg = "从redis中获取" + key + "错误：" + e.toString();
			LOGGER.error(errorMsg);
			result.put("result", errorMsg);
		}finally {

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

@@ -7,6 +7,9 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ai.ipu.basic.log.ILogger;
import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.ipu.basic.util.IpuUtility;
import com.ai.ipu.common.date.TimeUtil;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
@@ -24,6 +27,7 @@ import com.ailk.common.data.IData;
@Controller
@RequestMapping("/db/table")
public class DbTableController {
	private static final transient ILogger LOGGER = IpuLoggerFactory.createLogger(DbTableController.class);
    private String connName = "test";
    private String druidConnName = "test_druid";
    private String tableName = "ipu_db_demo";
@@ -37,8 +41,10 @@ public class DbTableController {
    @RequestMapping("/select")
    public JMap select(JMap param) throws Exception {
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
        int pk = param.getInt("pk", 0);
        LOGGER.info("select pk is:" + pk);
        JMap data = new JsonMap();
        data.put("pk", 0);
        data.put("pk", pk);
        Map<String, Object> re = dao.select(tableName, data);
        JMap result = new JsonMap();
        result.put("result", re);
@@ -72,7 +78,7 @@ public class DbTableController {
    public JMap insert(JMap param) throws Exception {
        BizSqlDao bizDao = IpuDaoManager.takeDao(BizSqlDao.class, connName);
        int pk = bizDao.takePK();
        
        LOGGER.info("insert pk is:" + pk);
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
        JMap data = new JsonMap();
        data.put("pk", pk);
@@ -141,11 +147,11 @@ public class DbTableController {
    @RequestMapping("/delete")
    public JMap delete(JMap params) throws Exception {
        BizSqlDao bizDao = IpuDaoManager.takeDao(BizSqlDao.class, connName);
        int pk = bizDao.takePK();
        
        int pk = params.getInt("pk", bizDao.takePK()-1);
        LOGGER.info("delete pk is:" + pk);
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
        JMap data = new JsonMap();
        data.put("pk", pk-1);
        data.put("pk", pk);
        
        Map<String, Object> content = dao.select(tableName, data);
        int re = dao.delete(tableName, data);
@@ -196,4 +202,30 @@ public class DbTableController {
        result.put("result", re);
        return result;
    }
    
    @ResponseBody
    @RequestMapping("/rollback")
    public JMap rollback(JMap param) throws Exception {
        BizSqlDao bizDao = IpuDaoManager.takeDao(BizSqlDao.class, connName);
        int pk = bizDao.takePK();
        LOGGER.info("insert pk is:" + pk);
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
        JMap data = new JsonMap();
        data.put("pk", pk);
        data.put("string_type", "字符串"+pk);
        data.put("int_type", pk);
        data.put("decimal_type", "10."+pk);
        data.put("date_type", TimeUtil.getSysDate());
        data.put("datetime_type", TimeUtil.getSysTime());
        int re = dao.insert(tableName, data);
        
        IpuUtility.error("rollback test");
        
        JMap conds = new JsonMap();
        conds.put("pk", pk);
        JMap result = new JsonMap();
        result.put("result_number", re);
        result.put("content", dao.select(tableName, conds));
        return result;
    }
}

ipu-rest-demo/src/main/java/com/ai/ipu/server/demo/control/dubbo/DubboControl.java

@@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
import com.ai.ipu.basic.reflect.ReflectUtil;
import com.ai.ipu.basic.util.IpuUtility;
import com.ai.ipu.data.JMap;
import com.ai.ipu.test.springboot.service.IBizService;
import com.ai.ipu.data.IData;
/**
 * @author huangbo@asiainfo.com
@@ -29,9 +29,9 @@ public class DubboControl {
     */
    @ResponseBody
    @RequestMapping("/biz")
    public JMap callBizService(JMap params) {
    public IData callBizService(IData params) {
//        IBizService bizService = (IBizService)SpringManager.takeSpringContext().getBean("bizService"); // 获取远程服务代理
    	JMap result = bizService.queryUserInfo(params); // 执行远程方法
    	IData result = bizService.queryUserInfo(params); // 执行远程方法
        result.put("rest_result", "测试biz类型服务调用");
        return result;
    }
@@ -43,17 +43,17 @@ public class DubboControl {
     */
    @ResponseBody
    @RequestMapping("/common")
    public JMap callCommonService(JMap params) {
    public IData callCommonService(IData params) {
//        String serviceName = params.getString("service_name");
        String methodName = params.getString("method_name");
//        Object service = SpringManager.takeSpringContext().getBean(serviceName);
        JMap result = null;
        IData result = null;
        try {
            result = (JMap)ReflectUtil.invokeMethod(bizService, methodName, new Object[]{params}, new Class<?>[]{JMap.class});
            result =(IData) ReflectUtil.invokeMethod(bizService, methodName, new Object[]{params}, new Class<?>[]{IData.class});
            result.put("rest_result", "测试common类型服务调用");
        }catch (Exception e) {
            // TODO Auto-generated catch block
            IpuUtility.error( methodName + "方法调用异常:" + e.getMessage());
            IpuUtility.error( methodName + "方法调用异常:" + e.toString());
        }
        return result;
    }

ipu-rest-demo/src/main/java/com/ai/ipu/server/demo/control/nacos/NacosController.java

@@ -85,7 +85,7 @@ public class NacosController {
	
		} catch (Exception e)
		{
			String errorMsg = "从nacos server:" + IpuNacosConfig.getNacosServerAddr() + "同步" + nacosConfig.getIpuCacheDataid() + "错误：" + e.getMessage();
			String errorMsg = "从nacos server:" + IpuNacosConfig.getNacosServerAddr() + "同步" + nacosConfig.getIpuCacheDataid() + "错误：" + e.toString();
			LOGGER.error(errorMsg);
			result.put("result", errorMsg);
		}finally {
@@ -145,7 +145,7 @@ public class NacosController {
		{
			if (noSql != null)
				noSql.abortTransaction();
			String errorMsg = "从nacos server:" + IpuNacosConfig.getNacosServerAddr() + "同步" + nacosConfig.getIpuNosqlDataid() + "错误：" + e.getMessage();
			String errorMsg = "从nacos server:" + IpuNacosConfig.getNacosServerAddr() + "同步" + nacosConfig.getIpuNosqlDataid() + "错误：" + e.toString();
			LOGGER.error(errorMsg);
			result.put("result", errorMsg);
		}finally {
@@ -220,7 +220,7 @@ public class NacosController {
	
		} catch (Exception e)
		{
			String errorMsg = "从nacos server:" + IpuNacosConfig.getNacosServerAddr() + "同步" + nacosConfig.getIpuDfsDataid() + "错误：" + e.getMessage();
			String errorMsg = "从nacos server:" + IpuNacosConfig.getNacosServerAddr() + "同步" + nacosConfig.getIpuDfsDataid() + "错误：" + e.toString();
			LOGGER.error(errorMsg);
			result.put("result", errorMsg);
		}finally {
@@ -278,7 +278,7 @@ public class NacosController {
	
		} catch (Exception e)
		{
			String errorMsg = "从nacos server:" + IpuNacosConfig.getNacosServerAddr() + "同步" + nacosConfig.getIpuDatabaseDataid() + "错误：" + e.getMessage();
			String errorMsg = "从nacos server:" + IpuNacosConfig.getNacosServerAddr() + "同步" + nacosConfig.getIpuDatabaseDataid() + "错误：" + e.toString();
			LOGGER.error(errorMsg);
			result.put("result", errorMsg);
		}finally {

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

@@ -2,6 +2,8 @@ package com.ipu.server.bean;
import java.awt.image.BufferedImage;
import com.ai.ipu.basic.log.ILogger;
import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.ipu.server.util.MobileUtility;
import com.ailk.common.data.IData;
import com.ailk.common.data.impl.DataMap;
@@ -13,12 +15,14 @@ import com.ipu.server.util.Constant;
import com.ipu.server.util.ImageVerify;
public class LoginBean extends IpuAppBean {
	private static final ILogger LOGGER = IpuLoggerFactory.createLogger(LoginBean.class);
	
	/**
	 * 初始化登陆页面,获取验证码
	 */
	public IData init(IData prama) throws Exception {
		String verifyCode = ImageVerify.getVerifyCode(6, 2);
		
		BufferedImage image = ImageVerify.getImageVerify(verifyCode);
		String imageVerifyCode = ImageVerify.getImageBase64(image);
@@ -30,6 +34,7 @@ public class LoginBean extends IpuAppBean {
		IData resultData = new DataMap();
		resultData.put("VERIFY_IMG", imageVerifyCode);
		resultData.put(Constant.Session.SESSION_ID, sessionId);
		resultData.put("VARIFY_CODE", verifyCode);
		return resultData;
	}
@@ -40,7 +45,7 @@ public class LoginBean extends IpuAppBean {
		String verifyCode = ImageVerify.getVerifyCode(6, 2);
		BufferedImage image = ImageVerify.getImageVerify(verifyCode);
		String imageVerifyCode = ImageVerify.getImageBase64(image);
		getContextData().setVerifyCode(verifyCode.toUpperCase());
//		getContextData().setVerifyCode(verifyCode.toUpperCase());
		IData resultData = new DataMap();
		resultData.put("VERIFY_IMG", imageVerifyCode);
		return resultData;
@@ -51,7 +56,7 @@ public class LoginBean extends IpuAppBean {
	 */
	public IData doLogin(IData param) throws Exception {
		/* 校验验证码 */
		String verifyCode = getContextData().getVerifyCode();
		String verifyCode = (String)getContextData().getMapData().get("VERIFY_CODE");
		String clientVerifyCode = param.getString("VARIFY_CODE");
		if (clientVerifyCode == null) {
			MobileUtility.error("验证码忘记填写了,重新输入验证码~");
@@ -66,7 +71,7 @@ public class LoginBean extends IpuAppBean {
		IData resultData = new DataMap();
		boolean isLoginSuccess = true;
		if (isLoginSuccess) {
			getContextData().setUserName(userName);
			getContextData().getMapData().put("USER_NAME", userName);
			resultData.put("LOGIN_SUCCESS", true);
		} else {
			resultData.put("LOGIN_SUCCESS", false);

ipu-rest-demo/src/main/java/com/ipu/server/core/bean/IpuAppBean.java

@@ -1,11 +1,11 @@
package com.ipu.server.core.bean;
import com.ai.ipu.server.frame.bean.AbstractBean;
import com.ipu.server.core.context.IpuContextData;
import com.ai.ipu.server.frame.context.impl.DefaultJsonContextData;
public class IpuAppBean extends AbstractBean {
	@Override
	protected IpuContextData getContextData() throws Exception {
		return (IpuContextData)(getContext().getContextData());
	protected DefaultJsonContextData getContextData() throws Exception {
		return (DefaultJsonContextData) getContext().getContextData();
	}
}

ipu-rest-demo/src/main/java/com/ipu/server/core/context/IpuContextData.java

@@ -1,9 +1,10 @@
package com.ipu.server.core.context;
import com.ai.ipu.server.frame.context.impl.DefaultContextData;
import com.ai.ipu.server.frame.context.impl.DefaultJsonContextData;
@SuppressWarnings("serial")
public class IpuContextData extends DefaultContextData {
public class IpuContextData extends DefaultJsonContextData {
	public IpuContextData() {
	}

ipu-rest-demo/src/main/java/com/ipu/server/core/session/IpuSessionManager.java

@@ -4,8 +4,7 @@ import com.ai.ipu.server.frame.context.IContextData;
import com.ai.ipu.server.frame.session.impl.AbstractSessionManager;
import com.ai.ipu.server.util.MobileUtility;
import com.ailk.common.data.IData;
import com.ipu.server.core.context.IpuContextData;
import com.ai.ipu.server.frame.context.impl.DefaultJsonContextData;
public class IpuSessionManager extends AbstractSessionManager {
	/**
@@ -14,7 +13,7 @@ public class IpuSessionManager extends AbstractSessionManager {
	@Override
	public void customVerify(String paramString, IData paramIData, IContextData paramIContextData) throws Exception {
		String userName = paramIData.getString("USER_NAME");
		String contextUserName = ((IpuContextData)paramIContextData).getUserName();
		String contextUserName = (String)((DefaultJsonContextData)paramIContextData).get("USER_NAME");
		if(userName == null || !userName.equals(contextUserName)){
			MobileUtility.error("非法操作，请重新登陆!", SESSION_ERROR_CODE);
		}