@IPU_REQ_2021@升级springboot为2.1.3-RELEASE，代码优化。

ipu-rest-demo/Dockerfile

@@ -1,5 +1,4 @@
FROM openjdk:8-jdk-alpine
VOLUME /tmp
WORKDIR /package
ADD  target/ipu-rest-demo.jar /package
ADD  target/ipu-rest-demo.jar .
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -jar ./ipu-rest-demo.jar $0 $@

ipu-rest-demo/pom.xml

@@ -11,30 +11,28 @@
	<packaging>jar</packaging>
	<name>ipu-rest-demo</name>
	<repositories>
		<!-- IPU相关仓库 -->
		<repository>
			<id>ipu</id>
			<name>ipu repository</name>
			<url>http://114.215.100.48:9090/nexus/content/groups/public/</url>
			<releases>
				<enabled>true</enabled>
			</releases>
			<snapshots>
				<enabled>true</enabled>
				<updatePolicy>always</updatePolicy>
			</snapshots>
		</repository>
	</repositories>
    <!-- 用于测试deploy需要上传的私人仓库，如不需要deploy，请屏蔽此段配置 -->
    <distributionManagement>
        <!-- release仓库 -->
        <repository>
            <id>ipu-private</id>
            <url>http://192.168.128.142:8081/nexus/content/repositories/releases/</url>
        </repository>
        <!-- snapshot仓库 -->
        <snapshotRepository>
            <id>ipu-private</id>
            <url>http://192.168.128.142:8081/nexus/content/repositories/snapshots/</url>
        </snapshotRepository>
    </distributionManagement>
    
	<properties>
		<env>dev</env>
		<skip-test>true</skip-test>
		<start-class>com.ai.ipu.server.demo.IpuRestDemoStart</start-class>
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
		<ipu>3.2-SNAPSHOT</ipu>
		<ipu-rest>3.2-SNAPSHOT</ipu-rest>
		<org.springframework.boot>1.5.9.RELEASE</org.springframework.boot>
		<ipu-rest>3.3-SNAPSHOT</ipu-rest>
		<org.springframework.boot>2.1.3.RELEASE</org.springframework.boot>
		<!-- docker仓库服务器及端口，如果只是docker容器，则为镜像前缀 -->
		<!-- ipudocker.com对应47.105.130.83  --> 
@@ -45,9 +43,8 @@
		<docker-registry-password>ipuDocker@83</docker-registry-password>
		<msgframe>1.9.2</msgframe>
		<mongodb.version>3.11.2</mongodb.version>
		<jms>1.1</jms>
		<google.plugin>29.0-jre</google.plugin>
		<google.plugin>16.0.1</google.plugin>
	</properties>
	<dependencyManagement>
@@ -55,7 +52,7 @@
			<dependency>
				<groupId>com.ai.ipu.server</groupId>
				<artifactId>ipu-dependencies</artifactId>
				<version>${ipu}</version>
				<version>${ipu-rest}</version>
				<type>pom</type>
				<scope>import</scope>
			</dependency>
@@ -72,17 +69,11 @@
	<dependencies>
		<!-- dubbo相关依赖 -->
		<dependency>
			<groupId>com.alibaba</groupId>
			<artifactId>dubbo</artifactId>
		</dependency>
		<dependency>
		    <groupId>com.github.sgroschupf</groupId>
		    <artifactId>zkclient</artifactId>
		</dependency>
		<dependency>
		    <groupId>com.netflix.curator</groupId>
		    <artifactId>curator-framework</artifactId>
			<groupId>com.ai.ipu.test</groupId>
			<artifactId>ipu-dubbo-api</artifactId>
			<version>0.0.1-SNAPSHOT</version>
		</dependency>
		<!-- msgframe相关依赖 -->
		<dependency>
			<groupId>com.ai.aif.msgframe</groupId>
@@ -101,51 +92,26 @@
        <dependency>
			<groupId>com.ai.ipu.server</groupId>
			<artifactId>ipu-restful</artifactId>
			<exclusions>
				<exclusion>
					<groupId>com.ai.ipu</groupId>
					<artifactId>ipu-cache</artifactId>
				</exclusion>
			</exclusions>
        </dependency>
        
        <!-- 使用ipu-nosql、ipu-cache 3.2-SNAPSHOT是因为配合ipu-spring-nacos自动同步配置所需 -->
		<dependency>
            <groupId>com.ai.ipu</groupId>
            <artifactId>ipu-nosql</artifactId>
            <version>${ipu}</version>
        </dependency>
		<dependency>
			<groupId>com.ai.ipu</groupId>
			<artifactId>ipu-cache</artifactId>
			<version>${ipu}</version>
		</dependency>
		<dependency>
		    <groupId>com.ai.ipu</groupId>
		    <artifactId>ipu-s3</artifactId>
		    <version>${ipu}</version>
		</dependency>
		<dependency>
			<groupId>com.ai.ipu</groupId>
			<artifactId>ipu-spring-nacos</artifactId>
			<version>${ipu}</version>
		</dependency>
		<dependency>
		    <groupId>com.google.guava</groupId>
		    <artifactId>guava</artifactId>
		    <version>${google.plugin}</version>
		</dependency>
        <!-- 这里引入mongo-java-driver的原因是springboot1.5.9缺省使用了mongo-java-driver低版本的驱动，
                                导致ipu-nosql里MongoCredential.createScramSha256Credential报“方法不存在”。
                               由于ipu-rest-libs里引入springboot采用了import方式；
                                因此无法通过修改mongodb.version覆盖springboot内的mongodb.version值。
                                如果ipu-rest-libs里引入springboot的方式采用parent，可以删除以下引入；
                                但要确保在当前pom.xml或ipu-rest-libs里通过重新定义mongodb.version来覆盖springboot的缺省值。 -->
        <dependency>
            <groupId>org.mongodb</groupId>
            <artifactId>mongo-java-driver</artifactId>
            <version>${mongodb.version}</version>
        </dependency>
	</dependencies>
	<build>

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

@@ -13,13 +13,13 @@ import com.ai.ipu.restful.spring.SpringManager;
 * @desc 启动的时候需要指定参数--server.port=8080
 */
public class IpuRestDemoStart {
    public final static String DUBBO_CONSUMER_CONFIG = "dubbo-consumer-simple.xml";
//    public final static String DUBBO_CONSUMER_CONFIG = "dubbo-consumer-simple.xml";
    public final static String EXCEPTION_MESSAGES_CONFIG = "exception_messages";
    
    public static void main(String[] args) {
        /*在spring中注册dubbo消费者配置*/
        SpringManager.registerSpringContext(
                new ClassPathXmlApplicationContext(new String[] { DUBBO_CONSUMER_CONFIG }));
//        SpringManager.registerSpringContext(
//                new ClassPathXmlApplicationContext(new String[] { DUBBO_CONSUMER_CONFIG }));
        /*注册dubbo异常信息编码配置*/
        IpuBaseException.registerCode(EXCEPTION_MESSAGES_CONFIG);
        /*启动SpringBoot服务*/

ipu-rest-demo/src/main/java/com/ai/ipu/server/demo/aspect/MongoTransactionAspect.java

@@ -11,7 +11,7 @@ import com.ai.ipu.nosql.mongodb.MongoCacheFactory;
@Aspect
public class MongoTransactionAspect {
    transient protected final ILogger log = IpuLoggerFactory.createLogger(MongoTransactionAspect.class);
    protected static final transient ILogger log = IpuLoggerFactory.createLogger(MongoTransactionAspect.class);
    static final String executionService = "execution(* com.ai..control..*(..))";
    
    @Pointcut(executionService)

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

@@ -6,6 +6,7 @@ import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.cache.RedisCacheManager;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.serializer.StringRedisSerializer;
@@ -56,11 +57,14 @@ public class RedisConfig {
     * @param redisTemplate
     * @return
     */
    @Bean
    public CacheManager cacheManager(RedisTemplate redisTemplate) {
        RedisCacheManager redisCacheManager = new RedisCacheManager(redisTemplate);
        return redisCacheManager;
    }
//    @Bean
//    public CacheManager cacheManager(RedisConnectionFactory redisConnectionFactory) {
//    	RedisCacheConfiguration redisCacheConfiguration = RedisCacheConfiguration.defaultCacheConfig()
//                .entryTtl( Duration.ofHours(1)); // 设置缓存有效期一小时
//        return RedisCacheManager
//                .builder( RedisCacheWriter.nonLockingRedisCacheWriter(redisConnectionFactory))
//                .cacheDefaults(redisCacheConfiguration).build();
//    }
    /**
     * 设置连接池属性

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

@@ -1,12 +1,6 @@
package com.ai.ipu.server.demo.control.cache;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -15,26 +9,10 @@ import com.ai.ipu.basic.log.ILogger;
import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.ipu.cache.CacheFactory;
import com.ai.ipu.cache.ICache;
import com.ai.ipu.cache.config.IpuCacheConfig;
import com.ai.ipu.common.xml.Dom4jHelper;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.ai.ipu.database.dao.IpuDaoManager;
import com.ai.ipu.database.dao.impl.SqlDao;
import com.ai.ipu.database.datasource.DataSourceEntity;
import com.ai.ipu.database.uitl.MybatisUtil;
import com.ai.ipu.dfs.s3.IFs;
import com.ai.ipu.dfs.s3.IpuDfsFactory;
import com.ai.ipu.dfs.s3.conf.IpuDfsConfig;
import com.ai.ipu.dfs.s3.entity.BucketEntity;
import com.ai.ipu.dfs.s3.entity.DfsEntity;
import com.ai.ipu.nacos.config.IpuNacosConfig;
import com.ai.ipu.nacos.service.IpuNacosServiceImpl;
import com.ai.ipu.nosql.INoSql;
import com.ai.ipu.nosql.config.IpuNoSQLConfig;
import com.ai.ipu.nosql.mongodb.MongoCacheFactory;
import com.ai.ipu.server.demo.config.IpuSpringNacosConfig;
import com.github.pagehelper.util.StringUtil;
/**
 * 基于ipu-cache组件操作范例
 * @author weihf@asiainfo.com
@@ -44,7 +22,7 @@ import com.github.pagehelper.util.StringUtil;
@Controller
@RequestMapping("/ipu-cache/")
public class RedisController {
	private static final ILogger LOGGER = IpuLoggerFactory.createLogger(RedisController.class);
	private static final transient ILogger LOGGER = IpuLoggerFactory.createLogger(RedisController.class);
	
	
	@ResponseBody
@@ -52,7 +30,7 @@ public class RedisController {
    public JMap get(JMap param) throws Exception {
		JMap result = new JsonMap();
		final String CACHE_KEY = "com:ai:ipu:rest-demo:test";
		final String DEFAULT_CONN_NAME = "ssn";
		final String DEFAULT_CONN_NAME = "test";
		String connName = param.getString("connName", DEFAULT_CONN_NAME);
		String key = param.getString("key", CACHE_KEY);
		ICache cache = null;
@@ -62,7 +40,7 @@ public class RedisController {
			LOGGER.debug(key + " is " + 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 {
@@ -79,7 +57,7 @@ public class RedisController {
		JMap result = new JsonMap();
		final String CACHE_KEY = "com:ai:ipu:rest-demo:test";
		final String CACHE_VALUE = "123";
		final String DEFAULT_CONN_NAME = "ssn";
		final String DEFAULT_CONN_NAME = "test";
		String connName = param.getString("connName", DEFAULT_CONN_NAME);
		String key = param.getString("key", CACHE_KEY);
		String value = param.getString("value", CACHE_VALUE);

ipu-rest-demo/src/main/java/com/ai/ipu/server/demo/control/common/ExceptionController.java

@@ -25,7 +25,7 @@ public class ExceptionController {
    @RequestMapping("/default")
    public JMap defaultException(JMap data) throws Exception {
        if(true){
            IpuUtility.error("抛出默认异常");
            IpuUtility.error("300");
        }
        return data;
    }

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

@@ -1,14 +1,14 @@
package com.ai.ipu.server.demo.control.dubbo;
import org.apache.dubbo.config.annotation.Reference;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
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.restful.spring.SpringManager;
import com.ai.ipu.service.demo.IBizService;
import com.ailk.common.data.IData;
import com.ai.ipu.data.JMap;
import com.ai.ipu.test.springboot.service.IBizService;
/**
 * @author huangbo@asiainfo.com
@@ -19,7 +19,9 @@ import com.ailk.common.data.IData;
@Controller
@RequestMapping("/dubbo")
public class DubboControl {
	@Reference
	IBizService bizService;
	
    /**
     * @author huangbo@asiainfo.com
     * @title: callBizService
@@ -27,9 +29,9 @@ public class DubboControl {
     */
    @ResponseBody
    @RequestMapping("/biz")
    public IData callBizService(IData params) {
        IBizService bizService = (IBizService)SpringManager.takeSpringContext().getBean("bizService"); // 获取远程服务代理
        IData result = bizService.queryUserInfo(params); // 执行远程方法
    public JMap callBizService(JMap params) {
//        IBizService bizService = (IBizService)SpringManager.takeSpringContext().getBean("bizService"); // 获取远程服务代理
    	JMap result = bizService.queryUserInfo(params); // 执行远程方法
        result.put("rest_result", "测试biz类型服务调用");
        return result;
    }
@@ -41,17 +43,17 @@ public class DubboControl {
     */
    @ResponseBody
    @RequestMapping("/common")
    public IData callCommonService(IData params) {
        String serviceName = params.getString("service_name");
    public JMap callCommonService(JMap params) {
//        String serviceName = params.getString("service_name");
        String methodName = params.getString("method_name");
        Object service = SpringManager.takeSpringContext().getBean(serviceName);
        IData result = null;
//        Object service = SpringManager.takeSpringContext().getBean(serviceName);
        JMap result = null;
        try {
            result = (IData)ReflectUtil.invokeMethod(service, methodName, new Object[]{params}, new Class<?>[]{IData.class});
            result = (JMap)ReflectUtil.invokeMethod(bizService, methodName, new Object[]{params}, new Class<?>[]{JMap.class});
            result.put("rest_result", "测试common类型服务调用");
        }catch (Exception e) {
            // TODO Auto-generated catch block
            IpuUtility.error(serviceName + "服务的" + methodName + "方法调用异常:" + e.getMessage());
            IpuUtility.error( methodName + "方法调用异常:" + e.getMessage());
        }
        return result;
    }

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

@@ -8,10 +8,12 @@ spring.mvc.static-path-pattern=/**
#spring.resources.static-locations=file:${web.root}
spring.resources.static-locations=classpath:/${web.root}
#默认/
server.context-path=/ipu
#1.x默认/
#server.context-path=/ipu
#默认/。注册DispatcherServlet对应path，亦可通过dispatcherRegistration方法配置
server.servlet-path=/
#server.servlet-path=/
#2.x
server.servlet.context-path=/ipu
#使用maven中的变量替换
logging.file=target/logs/${project.artifactId}.log
spring.application.name=${project.artifactId}
@@ -46,3 +48,13 @@ management.security.enabled=false
#重启目录
#spring.devtools.restart.additional-paths=src/main/java
#spring.devtools.restart.exclude=WEB-INF/**
spring.main.allow-bean-definition-overriding=true
dubbo.application.name=dubbo_consumer
dubbo.protocol.name=dubbo
dubbo.protocol.port=-1
dubbo.consumer.check=false
dubbo.registry.check=false
dubbo.registry.address=zookeeper://47.105.160.21:2108
dubbo.registry.client=curator

ipu-rest-demo/src/main/resources/dev/ipu-cache.xml

@@ -36,20 +36,21 @@
	<cache name="test" type="redis">
		<servers>
			<server ip="192.168.128.132" port="26379" />
			<server ip="192.168.128.132" port="26380" />
			<server ip="192.168.128.132" port="26381" />
			<server ip="192.168.128.143" port="7001" />
			<server ip="192.168.128.142" port="7001" />
			<server ip="192.168.128.129" port="7001" />
		</servers>
		<!-- 客户端类型:Jedis,JedisCluster,JedisSentinel -->
		<config name="clientType" value="JedisSentinel" />
		<config name="clientType" value="JedisCluster" />
		<!-- 主节点名 -->
		<config name="masterName" value="mymaster" />
		<!-- 访问redis的密码，可以为空 -->
		<config name="auth" value="" />
		<config name="auth" value="ipu@321" />
		<!-- redis池的可用连接实例的最大数目，缺省为8 -->
		<config name="poolSize" value="10" />
		<!-- redis池最多有多少个状态为idle(空闲的)的jedis实例，缺省为8,空闲连接大于这个数会进行回收 -->
		<config name="maxIdle" />
		<config name="maxIdle"  value="10"/>
		<!-- 最小空闲数，空闲连接小于这个数会建立新的连接，缺省为0 -->
		<config name="minIdle" />
		<!-- 等待Response超时时间,默认5000ms -->

ipu-rest-demo/src/main/resources/exception_messages_zh_CN.properties

@@ -1,2 +1,3 @@
100=条件参数不能为空
200=[%v]参数异常
200=[%v]参数异常
300=自定义异常