Sfoglia il codice sorgente

@IPU_FIXBUG_2021@代码优化

weihf 3 anni fa
parent
commit
8b09e167f6

+ 1 - 1
ipu-rest-demo/src/main/java/com/ai/ipu/server/demo/IpuRestDemoStart.java

@ -13,7 +13,7 @@ import com.ai.ipu.restful.spring.SpringManager;
13 13
 * @desc 启动的时候需要指定参数--server.port=8080
14 14
 */
15 15
public class IpuRestDemoStart {
16
//    public final static String DUBBO_CONSUMER_CONFIG = "dubbo-consumer-simple.xml";
16
    public final static String DUBBO_CONSUMER_CONFIG = "dubbo-consumer-nacos.xml";
17 17
    public final static String EXCEPTION_MESSAGES_CONFIG = "exception_messages";
18 18
    
19 19
    public static void main(String[] args) {

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

@ -64,6 +64,20 @@ public class DbSqlMgmtController {
64 64
    }
65 65
    
66 66
    @ResponseBody
67
    @RequestMapping("/delete")
68
    public JMap deleteByDbRepository(JMap param) throws Exception {
69
        // TODO Auto-generated method stub
70
    	JMap params = new JsonMap();
71
        params.put("pk", param.getInt("pk", 99));
72
        
73
        ISqlMgmtDao dao = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
74
        int num = dao.executeDelete("com.ai.ipu.ipu-db-demo", "delete", params);
75
        JMap result = new JsonMap();
76
        result.put("result", num);
77
        return result;
78
    }
79
    
80
    @ResponseBody
67 81
    @RequestMapping("/refresh")
68 82
    public JMap refreshSqlRepository(JMap param) throws Exception {
69 83
        // TODO Auto-generated method stub

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

@ -106,12 +106,16 @@ public class DbTableController {
106 106
    @RequestMapping("/update")
107 107
    public JMap update(JMap param) throws Exception {
108 108
        CommonTableDao dao = IpuDaoManager.takeDao(CommonTableDao.class, connName);
109
        int pk = param.getInt("pk", 0);
110
        long int_type = param.getLong("int_type", System.currentTimeMillis()%100);
109 111
        JMap data = new JsonMap();
110
        data.put("pk", 0);
111
        data.put("int_type", System.currentTimeMillis()%100);
112
        data.put("pk", pk);
113
        data.put("int_type", int_type);
112 114
        int re = dao.update(tableName, data);
113 115
        JMap result = new JsonMap();
114 116
        result.put("result_number", re);
117
        //"[int_type]不是主键,条件参数需要全部为主键"
118
        data.remove("int_type");
115 119
        result.put("content", dao.select(tableName, data));
116 120
        return result;
117 121
    }

+ 4 - 1
ipu-rest-demo/src/main/java/com/ai/ipu/server/demo/control/dubbo/DubboConsumerController.java

@ -1,7 +1,6 @@
1 1
package com.ai.ipu.server.demo.control.dubbo;
2 2

3 3

4
import org.springframework.data.annotation.Reference;
5 4
import org.springframework.stereotype.Controller;
6 5
import org.springframework.web.bind.annotation.RequestMapping;
7 6
import org.springframework.web.bind.annotation.ResponseBody;
@ -10,9 +9,11 @@ import com.ai.ipu.basic.log.ILogger;
10 9
import com.ai.ipu.basic.log.IpuLoggerFactory;
11 10
import com.ai.ipu.basic.reflect.ReflectUtil;
12 11
import com.ai.ipu.basic.util.IpuUtility;
12
import com.ai.ipu.restful.spring.SpringManager;
13 13
import com.ai.ipu.test.springboot.service.IBizService;
14 14
import com.ai.ipu.test.springboot.service.IpuService;
15 15
import com.ailk.common.data.IData;
16
import com.alibaba.dubbo.config.annotation.Reference;
16 17

17 18
/**
18 19
 * @author huangbo@asiainfo.com
@ -34,6 +35,7 @@ public class DubboConsumerController {
34 35
	@ResponseBody
35 36
    @RequestMapping("/index")
36 37
    public String index(String data) {
38
//		IpuService ipuService = (IpuService)SpringManager.takeSpringContext().getBean("ipuService"); // 获取远程服务代理
37 39
        logger.info("I am ConsumerController" + System.getProperty("user.home"));
38 40
        if(data==null||"".equals(data)){
39 41
            data="你啥都没有输入!";
@ -67,6 +69,7 @@ public class DubboConsumerController {
67 69
    @ResponseBody
68 70
    @RequestMapping("/common")
69 71
    public IData callCommonService(IData params) {
72
//    	IBizService bizService = (IBizService)SpringManager.takeSpringContext().getBean("bizService"); // 获取远程服务代理
70 73
//        String serviceName = params.getString("service_name");
71 74
        String methodName = params.getString("method_name");
72 75
//        Object service = SpringManager.takeSpringContext().getBean(serviceName);

+ 3 - 1
ipu-rest-demo/src/main/resources/dev/application.properties

@ -55,7 +55,7 @@ spring.main.allow-bean-definition-overriding=true
55 55
#dubbo.protocol.name=dubbo
56 56
dubbo.protocol.port=-1
57 57
dubbo.consumer.check=false
58
#dubbo.registry.check=false
58
dubbo.registry.check=false
59 59
#dubbo.registry.address=zookeeper://47.105.160.21:2108
60 60
#dubbo.registry.client=curator
61 61

@ -64,3 +64,5 @@ dubbo.application.name=dubbo_consumer
64 64
dubbo.registry.address=nacos://47.105.160.21:8849
65 65
dubbo.protocol.name=dubbo
66 66

67
#spring-data-es配置
68
spring.elasticsearch.rest.uris=http://47.105.160.21:10020

+ 3 - 1
ipu-rest-demo/src/main/resources/dev/dubbo-consumer-simple.xml

@ -15,6 +15,8 @@
15 15

16 16
	<!-- 服务注册配置 start=========================== -->
17 17
	<dubbo:reference id="bizService"
18
		interface="com.ai.ipu.service.demo.IBizService" />
18
		interface="com.ai.ipu.test.springboot.service.IBizService" />
19
		<dubbo:reference id="ipuService"
20
		interface="com.ai.ipu.test.springboot.service.IpuService" />
19 21
	<!-- 服务注册配置 end =========================== -->
20 22
</beans>

+ 3 - 2
ipu-rest-demo/src/main/resources/ipu-spring-mvc.xml

@ -1,6 +1,6 @@
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<beans xmlns="http://www.springframework.org/schema/beans"
3
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
3
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
4 4
	xmlns:context="http://www.springframework.org/schema/context"
5 5
	xmlns:mvc="http://www.springframework.org/schema/mvc"
6 6
	xsi:schemaLocation="http://www.springframework.org/schema/beans 
@ -11,7 +11,8 @@
11 11
		http://www.springframework.org/schema/mvc/spring-mvc.xsd">
12 12
	<!-- 自定义的control扫描目录 -->
13 13
    <context:component-scan base-package="com.ai.ipu.server.demo" />
14

14 15
    <!-- 扫描ipu-spring-nacos -->
15 16
    <context:component-scan base-package="com.ai.ipu.nacos.*" />
16
    <bean id="mongoTranscationAspects" class="com.ai.ipu.server.demo.aspect.MongoTransactionAspect" />
17
    <!-- <bean id="mongoTranscationAspects" class="com.ai.ipu.server.demo.aspect.MongoTransactionAspect" /> -->
17 18
</beans>