浏览代码

@IPU_FIXBUG_2021@代码优化

weihf 4 年之前
父节点
当前提交
2b3ffa7ca5

+ 13 - 0
ipu-rest-demo/pom.xml

117
		    <artifactId>guava</artifactId>
117
		    <artifactId>guava</artifactId>
118
		    <version>${google.plugin}</version>
118
		    <version>${google.plugin}</version>
119
		</dependency>
119
		</dependency>
120
				<dependency>
121
			<groupId>mysql</groupId>
122
			<artifactId>mysql-connector-java</artifactId>
123
			<version>8.0.15</version>
124
		</dependency>
120
	</dependencies>
125
	</dependencies>
121
126
122
	<build>
127
	<build>
125
			<plugin>
130
			<plugin>
126
				<groupId>org.springframework.boot</groupId>
131
				<groupId>org.springframework.boot</groupId>
127
				<artifactId>spring-boot-maven-plugin</artifactId>
132
				<artifactId>spring-boot-maven-plugin</artifactId>
133
				<version>2.4.5</version>
134
				
135
				    <configuration>
136
      <image>
137
        <name>megale/${project.artifactId}:${project.version}</name>
138
      </image>
139
    </configuration>
140
				
128
			</plugin>
141
			</plugin>
129
			<!-- 添加docker镜像功能 -->
142
			<!-- 添加docker镜像功能 -->
130
			<plugin>
143
			<plugin>

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

68
			LOGGER.debug(result.getString("result"));				
68
			LOGGER.debug(result.getString("result"));				
69
		} catch (Exception e)
69
		} catch (Exception e)
70
		{
70
		{
71
			String errorMsg = "从redis中获取" + key + "错误:" + e.getMessage();
71
			String errorMsg = "从redis中获取" + key + "错误:" + e.toString();
72
			LOGGER.error(errorMsg);
72
			LOGGER.error(errorMsg);
73
			result.put("result", errorMsg);
73
			result.put("result", errorMsg);
74
		}finally {
74
		}finally {
94
			LOGGER.debug(result.getString("result"));		
94
			LOGGER.debug(result.getString("result"));		
95
		} catch (Exception e)
95
		} catch (Exception e)
96
		{
96
		{
97
			String errorMsg = "从redis中获取" + key + "错误:" + e.getMessage();
97
			String errorMsg = "从redis中获取" + key + "错误:" + e.toString();
98
			LOGGER.error(errorMsg);
98
			LOGGER.error(errorMsg);
99
			result.put("result", errorMsg);
99
			result.put("result", errorMsg);
100
		}finally {
100
		}finally {

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

7
import org.springframework.web.bind.annotation.RequestMapping;
7
import org.springframework.web.bind.annotation.RequestMapping;
8
import org.springframework.web.bind.annotation.ResponseBody;
8
import org.springframework.web.bind.annotation.ResponseBody;
9

9

10
import com.ai.ipu.basic.log.ILogger;
11
import com.ai.ipu.basic.log.IpuLoggerFactory;
12
import com.ai.ipu.basic.util.IpuUtility;
10
import com.ai.ipu.common.date.TimeUtil;
13
import com.ai.ipu.common.date.TimeUtil;
11
import com.ai.ipu.data.JMap;
14
import com.ai.ipu.data.JMap;
12
import com.ai.ipu.data.impl.JsonMap;
15
import com.ai.ipu.data.impl.JsonMap;
24
@Controller
27
@Controller
25
@RequestMapping("/db/table")
28
@RequestMapping("/db/table")
26
public class DbTableController {
29
public class DbTableController {
30
	private static final transient ILogger LOGGER = IpuLoggerFactory.createLogger(DbTableController.class);
27
    private String connName = "test";
31
    private String connName = "test";
28
    private String druidConnName = "test_druid";
32
    private String druidConnName = "test_druid";
29
    private String tableName = "ipu_db_demo";
33
    private String tableName = "ipu_db_demo";
37
    @RequestMapping("/select")
41
    @RequestMapping("/select")
38
    public JMap select(JMap param) throws Exception {
42
    public JMap select(JMap param) throws Exception {
39
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
43
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
44
        int pk = param.getInt("pk", 0);
45
        LOGGER.info("select pk is:" + pk);
40
        JMap data = new JsonMap();
46
        JMap data = new JsonMap();
41
        data.put("pk", 0);
47
        data.put("pk", pk);
42
        Map<String, Object> re = dao.select(tableName, data);
48
        Map<String, Object> re = dao.select(tableName, data);
43
        JMap result = new JsonMap();
49
        JMap result = new JsonMap();
44
        result.put("result", re);
50
        result.put("result", re);
72
    public JMap insert(JMap param) throws Exception {
78
    public JMap insert(JMap param) throws Exception {
73
        BizSqlDao bizDao = IpuDaoManager.takeDao(BizSqlDao.class, connName);
79
        BizSqlDao bizDao = IpuDaoManager.takeDao(BizSqlDao.class, connName);
74
        int pk = bizDao.takePK();
80
        int pk = bizDao.takePK();
75
        
81
        LOGGER.info("insert pk is:" + pk);
76
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
82
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
77
        JMap data = new JsonMap();
83
        JMap data = new JsonMap();
78
        data.put("pk", pk);
84
        data.put("pk", pk);
141
    @RequestMapping("/delete")
147
    @RequestMapping("/delete")
142
    public JMap delete(JMap params) throws Exception {
148
    public JMap delete(JMap params) throws Exception {
143
        BizSqlDao bizDao = IpuDaoManager.takeDao(BizSqlDao.class, connName);
149
        BizSqlDao bizDao = IpuDaoManager.takeDao(BizSqlDao.class, connName);
144
        int pk = bizDao.takePK();
145
        
150
        int pk = params.getInt("pk", bizDao.takePK()-1);
151
        LOGGER.info("delete pk is:" + pk);
146
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
152
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
147
        JMap data = new JsonMap();
153
        JMap data = new JsonMap();
148
        data.put("pk", pk-1);
154
        data.put("pk", pk);
149
        
155
        
150
        Map<String, Object> content = dao.select(tableName, data);
156
        Map<String, Object> content = dao.select(tableName, data);
151
        int re = dao.delete(tableName, data);
157
        int re = dao.delete(tableName, data);
196
        result.put("result", re);
202
        result.put("result", re);
197
        return result;
203
        return result;
198
    }
204
    }
205
    
206
    @ResponseBody
207
    @RequestMapping("/rollback")
208
    public JMap rollback(JMap param) throws Exception {
209
        BizSqlDao bizDao = IpuDaoManager.takeDao(BizSqlDao.class, connName);
210
        int pk = bizDao.takePK();
211
        LOGGER.info("insert pk is:" + pk);
212
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
213
        JMap data = new JsonMap();
214
        data.put("pk", pk);
215
        data.put("string_type", "字符串"+pk);
216
        data.put("int_type", pk);
217
        data.put("decimal_type", "10."+pk);
218
        data.put("date_type", TimeUtil.getSysDate());
219
        data.put("datetime_type", TimeUtil.getSysTime());
220
        int re = dao.insert(tableName, data);
221
        
222
        IpuUtility.error("rollback test");
223
        
224
        JMap conds = new JsonMap();
225
        conds.put("pk", pk);
226
        JMap result = new JsonMap();
227
        result.put("result_number", re);
228
        result.put("content", dao.select(tableName, conds));
229
        return result;
230
    }
199
}
231
}

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

7

7

8
import com.ai.ipu.basic.reflect.ReflectUtil;
8
import com.ai.ipu.basic.reflect.ReflectUtil;
9
import com.ai.ipu.basic.util.IpuUtility;
9
import com.ai.ipu.basic.util.IpuUtility;
10
import com.ai.ipu.data.JMap;
11
import com.ai.ipu.test.springboot.service.IBizService;
10
import com.ai.ipu.test.springboot.service.IBizService;
11
import com.ai.ipu.data.IData;
12

12

13
/**
13
/**
14
 * @author huangbo@asiainfo.com
14
 * @author huangbo@asiainfo.com
29
     */
29
     */
30
    @ResponseBody
30
    @ResponseBody
31
    @RequestMapping("/biz")
31
    @RequestMapping("/biz")
32
    public JMap callBizService(JMap params) {
32
    public IData callBizService(IData params) {
33
//        IBizService bizService = (IBizService)SpringManager.takeSpringContext().getBean("bizService"); // 获取远程服务代理
33
//        IBizService bizService = (IBizService)SpringManager.takeSpringContext().getBean("bizService"); // 获取远程服务代理
34
    	JMap result = bizService.queryUserInfo(params); // 执行远程方法
34
    	IData result = bizService.queryUserInfo(params); // 执行远程方法
35
        result.put("rest_result", "测试biz类型服务调用");
35
        result.put("rest_result", "测试biz类型服务调用");
36
        return result;
36
        return result;
37
    }
37
    }
43
     */
43
     */
44
    @ResponseBody
44
    @ResponseBody
45
    @RequestMapping("/common")
45
    @RequestMapping("/common")
46
    public JMap callCommonService(JMap params) {
46
    public IData callCommonService(IData params) {
47
//        String serviceName = params.getString("service_name");
47
//        String serviceName = params.getString("service_name");
48
        String methodName = params.getString("method_name");
48
        String methodName = params.getString("method_name");
49
//        Object service = SpringManager.takeSpringContext().getBean(serviceName);
49
//        Object service = SpringManager.takeSpringContext().getBean(serviceName);
50
        JMap result = null;
50
        IData result = null;
51
        try {
51
        try {
52
            result = (JMap)ReflectUtil.invokeMethod(bizService, methodName, new Object[]{params}, new Class<?>[]{JMap.class});
52
            result =(IData) ReflectUtil.invokeMethod(bizService, methodName, new Object[]{params}, new Class<?>[]{IData.class});
53
            result.put("rest_result", "测试common类型服务调用");
53
            result.put("rest_result", "测试common类型服务调用");
54
        }catch (Exception e) {
54
        }catch (Exception e) {
55
            // TODO Auto-generated catch block
55
            // TODO Auto-generated catch block
56
            IpuUtility.error( methodName + "方法调用异常:" + e.getMessage());
56
            IpuUtility.error( methodName + "方法调用异常:" + e.toString());
57
        }
57
        }
58
        return result;
58
        return result;
59
    }
59
    }

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

85
	
85
	
86
		} catch (Exception e)
86
		} catch (Exception e)
87
		{
87
		{
88
			String errorMsg = "从nacos server:" + IpuNacosConfig.getNacosServerAddr() + "同步" + nacosConfig.getIpuCacheDataid() + "错误:" + e.getMessage();
88
			String errorMsg = "从nacos server:" + IpuNacosConfig.getNacosServerAddr() + "同步" + nacosConfig.getIpuCacheDataid() + "错误:" + e.toString();
89
			LOGGER.error(errorMsg);
89
			LOGGER.error(errorMsg);
90
			result.put("result", errorMsg);
90
			result.put("result", errorMsg);
91
		}finally {
91
		}finally {
145
		{
145
		{
146
			if (noSql != null)
146
			if (noSql != null)
147
				noSql.abortTransaction();
147
				noSql.abortTransaction();
148
			String errorMsg = "从nacos server:" + IpuNacosConfig.getNacosServerAddr() + "同步" + nacosConfig.getIpuNosqlDataid() + "错误:" + e.getMessage();
148
			String errorMsg = "从nacos server:" + IpuNacosConfig.getNacosServerAddr() + "同步" + nacosConfig.getIpuNosqlDataid() + "错误:" + e.toString();
149
			LOGGER.error(errorMsg);
149
			LOGGER.error(errorMsg);
150
			result.put("result", errorMsg);
150
			result.put("result", errorMsg);
151
		}finally {
151
		}finally {
220
	
220
	
221
		} catch (Exception e)
221
		} catch (Exception e)
222
		{
222
		{
223
			String errorMsg = "从nacos server:" + IpuNacosConfig.getNacosServerAddr() + "同步" + nacosConfig.getIpuDfsDataid() + "错误:" + e.getMessage();
223
			String errorMsg = "从nacos server:" + IpuNacosConfig.getNacosServerAddr() + "同步" + nacosConfig.getIpuDfsDataid() + "错误:" + e.toString();
224
			LOGGER.error(errorMsg);
224
			LOGGER.error(errorMsg);
225
			result.put("result", errorMsg);
225
			result.put("result", errorMsg);
226
		}finally {
226
		}finally {
278
	
278
	
279
		} catch (Exception e)
279
		} catch (Exception e)
280
		{
280
		{
281
			String errorMsg = "从nacos server:" + IpuNacosConfig.getNacosServerAddr() + "同步" + nacosConfig.getIpuDatabaseDataid() + "错误:" + e.getMessage();
281
			String errorMsg = "从nacos server:" + IpuNacosConfig.getNacosServerAddr() + "同步" + nacosConfig.getIpuDatabaseDataid() + "错误:" + e.toString();
282
			LOGGER.error(errorMsg);
282
			LOGGER.error(errorMsg);
283
			result.put("result", errorMsg);
283
			result.put("result", errorMsg);
284
		}finally {
284
		}finally {

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

2

2

3
import java.awt.image.BufferedImage;
3
import java.awt.image.BufferedImage;
4

4

5
import com.ai.ipu.basic.log.ILogger;
6
import com.ai.ipu.basic.log.IpuLoggerFactory;
5
import com.ai.ipu.server.util.MobileUtility;
7
import com.ai.ipu.server.util.MobileUtility;
6
import com.ailk.common.data.IData;
8
import com.ailk.common.data.IData;
7
import com.ailk.common.data.impl.DataMap;
9
import com.ailk.common.data.impl.DataMap;
13
import com.ipu.server.util.ImageVerify;
15
import com.ipu.server.util.ImageVerify;
14

16

15
public class LoginBean extends IpuAppBean {
17
public class LoginBean extends IpuAppBean {
18
	private static final ILogger LOGGER = IpuLoggerFactory.createLogger(LoginBean.class);
16
	
19
	
17
	/**
20
	/**
18
	 * 初始化登陆页面,获取验证码
21
	 * 初始化登陆页面,获取验证码
19
	 */
22
	 */
20
	public IData init(IData prama) throws Exception {
23
	public IData init(IData prama) throws Exception {
21
		String verifyCode = ImageVerify.getVerifyCode(6, 2);
24
		String verifyCode = ImageVerify.getVerifyCode(6, 2);
25
		
22
		BufferedImage image = ImageVerify.getImageVerify(verifyCode);
26
		BufferedImage image = ImageVerify.getImageVerify(verifyCode);
23
		String imageVerifyCode = ImageVerify.getImageBase64(image);
27
		String imageVerifyCode = ImageVerify.getImageBase64(image);
24

28

30
		IData resultData = new DataMap();
34
		IData resultData = new DataMap();
31
		resultData.put("VERIFY_IMG", imageVerifyCode);
35
		resultData.put("VERIFY_IMG", imageVerifyCode);
32
		resultData.put(Constant.Session.SESSION_ID, sessionId);
36
		resultData.put(Constant.Session.SESSION_ID, sessionId);
37
		resultData.put("VARIFY_CODE", verifyCode);
33
		return resultData;
38
		return resultData;
34
	}
39
	}
35

40

40
		String verifyCode = ImageVerify.getVerifyCode(6, 2);
45
		String verifyCode = ImageVerify.getVerifyCode(6, 2);
41
		BufferedImage image = ImageVerify.getImageVerify(verifyCode);
46
		BufferedImage image = ImageVerify.getImageVerify(verifyCode);
42
		String imageVerifyCode = ImageVerify.getImageBase64(image);
47
		String imageVerifyCode = ImageVerify.getImageBase64(image);
43
		getContextData().setVerifyCode(verifyCode.toUpperCase());
48
//		getContextData().setVerifyCode(verifyCode.toUpperCase());
44
		IData resultData = new DataMap();
49
		IData resultData = new DataMap();
45
		resultData.put("VERIFY_IMG", imageVerifyCode);
50
		resultData.put("VERIFY_IMG", imageVerifyCode);
46
		return resultData;
51
		return resultData;
51
	 */
56
	 */
52
	public IData doLogin(IData param) throws Exception {
57
	public IData doLogin(IData param) throws Exception {
53
		/* 校验验证码 */
58
		/* 校验验证码 */
54
		String verifyCode = getContextData().getVerifyCode();
59
		String verifyCode = (String)getContextData().getMapData().get("VERIFY_CODE");
55
		String clientVerifyCode = param.getString("VARIFY_CODE");
60
		String clientVerifyCode = param.getString("VARIFY_CODE");
56
		if (clientVerifyCode == null) {
61
		if (clientVerifyCode == null) {
57
			MobileUtility.error("验证码忘记填写了,重新输入验证码~");
62
			MobileUtility.error("验证码忘记填写了,重新输入验证码~");
66
		IData resultData = new DataMap();
71
		IData resultData = new DataMap();
67
		boolean isLoginSuccess = true;
72
		boolean isLoginSuccess = true;
68
		if (isLoginSuccess) {
73
		if (isLoginSuccess) {
69
			getContextData().setUserName(userName);
74
			getContextData().getMapData().put("USER_NAME", userName);
70
			resultData.put("LOGIN_SUCCESS", true);
75
			resultData.put("LOGIN_SUCCESS", true);
71
		} else {
76
		} else {
72
			resultData.put("LOGIN_SUCCESS", false);
77
			resultData.put("LOGIN_SUCCESS", false);

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

1
package com.ipu.server.core.bean;
1
package com.ipu.server.core.bean;
2

2

3
import com.ai.ipu.server.frame.bean.AbstractBean;
3
import com.ai.ipu.server.frame.bean.AbstractBean;
4
import com.ipu.server.core.context.IpuContextData;
4
import com.ai.ipu.server.frame.context.impl.DefaultJsonContextData;
5

5

6
public class IpuAppBean extends AbstractBean {
6
public class IpuAppBean extends AbstractBean {
7
	@Override
8
	protected IpuContextData getContextData() throws Exception {
9
		return (IpuContextData)(getContext().getContextData());
7

8
	protected DefaultJsonContextData getContextData() throws Exception {
9
		return (DefaultJsonContextData) getContext().getContextData();
10
	}
10
	}
11
}
11
}

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

1
package com.ipu.server.core.context;
1
package com.ipu.server.core.context;
2

2

3
import com.ai.ipu.server.frame.context.impl.DefaultContextData;
3
import com.ai.ipu.server.frame.context.impl.DefaultContextData;
4
import com.ai.ipu.server.frame.context.impl.DefaultJsonContextData;
4

5

5
@SuppressWarnings("serial")
6
@SuppressWarnings("serial")
6
public class IpuContextData extends DefaultContextData {
7
public class IpuContextData extends DefaultJsonContextData {
7
	public IpuContextData() {
8
	public IpuContextData() {
8
	}
9
	}
9

10


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

4
import com.ai.ipu.server.frame.session.impl.AbstractSessionManager;
4
import com.ai.ipu.server.frame.session.impl.AbstractSessionManager;
5
import com.ai.ipu.server.util.MobileUtility;
5
import com.ai.ipu.server.util.MobileUtility;
6
import com.ailk.common.data.IData;
6
import com.ailk.common.data.IData;
7
import com.ipu.server.core.context.IpuContextData;
8

7
import com.ai.ipu.server.frame.context.impl.DefaultJsonContextData;
9
public class IpuSessionManager extends AbstractSessionManager {
8
public class IpuSessionManager extends AbstractSessionManager {
10

9

11
	/**
10
	/**
14
	@Override
13
	@Override
15
	public void customVerify(String paramString, IData paramIData, IContextData paramIContextData) throws Exception {
14
	public void customVerify(String paramString, IData paramIData, IContextData paramIContextData) throws Exception {
16
		String userName = paramIData.getString("USER_NAME");
15
		String userName = paramIData.getString("USER_NAME");
17
		String contextUserName = ((IpuContextData)paramIContextData).getUserName();
16
		String contextUserName = (String)((DefaultJsonContextData)paramIContextData).get("USER_NAME");
18
		if(userName == null || !userName.equals(contextUserName)){
17
		if(userName == null || !userName.equals(contextUserName)){
19
			MobileUtility.error("非法操作,请重新登陆!", SESSION_ERROR_CODE);
18
			MobileUtility.error("非法操作,请重新登陆!", SESSION_ERROR_CODE);
20
		}
19
		}