update

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-architect

iBase4J-Biz-Service/pom.xml

@@ -45,22 +45,16 @@
 			<artifactId>mysql-connector-java</artifactId>
 			<version>${mysql.version}</version>
 		</dependency>
-		<!-- mybatis -->
-		<dependency>
-			<groupId>org.mybatis</groupId>
-			<artifactId>mybatis</artifactId>
-			<version>${mybatis.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.mybatis</groupId>
-			<artifactId>mybatis-spring</artifactId>
-			<version>${mybatis-spring.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid</artifactId>
 			<version>${druid.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus</artifactId>
+			<version>${mybatis-plus.version}</version>
+		</dependency>
 		<!-- Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -87,6 +81,11 @@
 			<artifactId>spring-jms</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-redis</artifactId>
+			<version>${spring-data-redis.version}</version>
+		</dependency>
 		<!-- 切面 -->
 		<dependency>
 			<groupId>org.aspectj</groupId>
@@ -98,11 +97,28 @@
 			<artifactId>aspectjweaver</artifactId>
 			<version>${aspectj.version}</version>
 		</dependency>
+		<!-- 缓存 -->
+		<dependency>
+			<groupId>redis.clients</groupId>
+			<artifactId>jedis</artifactId>
+			<version>${jedis.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.redisson</groupId>
+			<artifactId>redisson</artifactId>
+			<version>${redisson.version}</version>
+		</dependency>
 		<!-- 中文拼音 -->
 		<dependency>
 			<groupId>com.belerweb</groupId>
 			<artifactId>pinyin4j</artifactId>
 			<version>${pinyin4j.version}</version>
 		</dependency>
+		<!-- 反射工具 -->
+		<dependency>
+			<groupId>org.db4j</groupId>
+			<artifactId>reflectasm</artifactId>
+			<version>1.11.4-2</version>
+		</dependency>
 	</dependencies>
 </project>

iBase4J-Biz-Service/src/main/resources/Spring-config.xml

@@ -34,9 +34,9 @@
 	</context:component-scan>
 	<!-- 引入SPRING配置文件 -->
 	<!-- <import resource="spring/mq.xml"/> -->
-	<import resource="spring/dubbo.xml" />
-	<!-- <import resource="spring/motan.xml" /> -->
-	<import resource="spring/redis.xml"/>
+	<!-- <import resource="spring/dubbo.xml" /> -->
+	<import resource="spring/motan.xml" />
+	<import resource="spring/redis.xml" />
 	<import resource="spring/mybatis.xml"/>
 	<import resource="spring/dataSource.xml"/>
 </beans>

iBase4J-Biz-Service/src/main/resources/log4j2.xml

@@ -5,7 +5,6 @@
 		<!-- 日志备份目录 -->
 		<property name="BACKUP_HOME">backup</property>
 		<property name="SERVER_NAME">${project.artifactId}</property>
-		<property name="EVERY_FILE_SIZE">5M</property><!-- 日志切割的最小单位 -->
 		<property name="OUTPUT_LOG_LEVEL">DEBUG</property><!-- 日志输出级别 -->
 	</properties>
 	<appenders>
@@ -17,23 +16,15 @@
 			fileName="${LOG_HOME}/dev_${SERVER_NAME}.log"
 			filePattern="${LOG_HOME}/dev_${BACKUP_HOME}/dev_${SERVER_NAME}.%d{yyyy-MM-dd-HH}.log">
 			<PatternLayout pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %level [%C{36}.%M] - %msg%n" />
-			<Policies>
-                <SizeBasedTriggeringPolicy size="${EVERY_FILE_SIZE}" />
-                <TimeBasedTriggeringPolicy interval="1" modulate="true" />
-            </Policies>
+			<CronTriggeringPolicy schedule="0 0 * * * ?" />
 			<Filters>
 				<ThresholdFilter level="error" onMatch="DENY" onMismatch="NEUTRAL" />
 				<ThresholdFilter level="trace" onMatch="ACCEPT" onMismatch="DENY" />
 			</Filters>
             <DefaultRolloverStrategy>
-                <!-- 删除指定目录下7天之前的日志-->
-                <Delete basePath="${LOG_HOME}/${BACKUP_HOME}" maxDepth="1">
-                    <IfFileName glob="*/${SERVER_NAME}*.log" />
-                    <IfLastModified age="7d" />
-                </Delete>
-                <Delete basePath="${LOG_HOME}/dev_${BACKUP_HOME}" maxDepth="1">
-                    <IfFileName glob="*/dev_${SERVER_NAME}*.log" />
-                    <IfLastModified age="7d" />
+                <Delete basePath="${LOG_HOME}" maxDepth="2">
+                    <IfFileName glob="*.log" />
+                    <IfLastModified age="200H" />
                 </Delete>
             </DefaultRolloverStrategy>
 		</RollingFile>
@@ -42,10 +33,7 @@
 			fileName="${LOG_HOME}/dev_${SERVER_NAME}_error.log"
 			filePattern="${LOG_HOME}/dev_${BACKUP_HOME}/dev_${SERVER_NAME}_error.%d{yyyy-MM-dd-HH}.log">
 			<PatternLayout pattern="%d{yyyy.MM.dd HH:mm:ss.SSS} [%thread] %level [%C{36}.%M:%L] - %msg%xEx%n" />
-			<Policies>  
-                <SizeBasedTriggeringPolicy size="${EVERY_FILE_SIZE}" />
-                <TimeBasedTriggeringPolicy interval="1" modulate="true" />
-            </Policies> 
+			<CronTriggeringPolicy schedule="0 0 * * * ?" />
 			<Filters>
 				<ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY" />
 			</Filters>
@@ -55,23 +43,22 @@
 			fileName="${LOG_HOME}/${SERVER_NAME}.log"
 			filePattern="${LOG_HOME}/${BACKUP_HOME}/${SERVER_NAME}.%d{yyyy-MM-dd-HH}.log">
 			<PatternLayout pattern="%d{yyyy.MM.dd HH:mm:ss.SSS} [%thread] %level [%C{36}.%M:%L] - %msg%xEx%n" />
-            <Policies>  
-                <SizeBasedTriggeringPolicy size="${EVERY_FILE_SIZE}" />
-                <TimeBasedTriggeringPolicy interval="1"  modulate="true" />  
-            </Policies>
+			<CronTriggeringPolicy schedule="0 0 * * * ?" />
         </RollingRandomAccessFile>
 	</appenders>
 
 	<loggers>
 		<logger name="org.slf4j" level="INFO" />
 		<logger name="org.quartz" level="INFO" />
 		<logger name="org.redisson" level="INFO" />
+		<logger name="com.alibaba" level="WARN" />
 		<logger name="com.atomikos" level="WARN" />
 		<logger name="com.alibaba.dubbo" level="INFO" />
 		<logger name="org.apache.activemq" level="INFO" />
 		<logger name="org.springframework" level="INFO" />
 		<logger name="com.weibo.api.motan" level="INFO" />
 		<logger name="org.apache.zookeeper" level="WARN" />
+		<logger name="com.baomidou.mybatisplus" level="INFO" />
 		<logger name="org.springframework.web" level="${OUTPUT_LOG_LEVEL}" />
 		<Logger  name="org.ibase4j" level="${OUTPUT_LOG_LEVEL}" additivity="false" includeLocation="true">  
 			<appender-ref ref="Console" />

iBase4J-Biz-Web/pom.xml

@@ -7,6 +7,7 @@
 		<version>1.1.0</version>
 	</parent>
 	<artifactId>iBase4J-Biz-Web</artifactId>
+	<name>iBase4J-Biz-Web</name>
 	<packaging>war</packaging>
 
 	<properties>
@@ -58,6 +59,22 @@
 			<artifactId>spring-session</artifactId>
 			<version>${spring-session.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-redis</artifactId>
+			<version>${spring-data-redis.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjweaver</artifactId>
+			<version>${aspectj.version}</version>
+		</dependency>
+		<!-- 缓存 -->
+		<dependency>
+			<groupId>redis.clients</groupId>
+			<artifactId>jedis</artifactId>
+			<version>${jedis.version}</version>
+		</dependency>
 		<!-- shiro -->
 		<dependency>
 			<groupId>org.apache.shiro</groupId>

iBase4J-Biz-Web/src/main/java/org/ibase4j/core/config/SwaggerConfig.java

@@ -1,6 +1,7 @@
 package org.ibase4j.core.config;
 
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
@@ -18,12 +19,12 @@
 @Configuration
 @EnableWebMvc
 @EnableSwagger2
+@ComponentScan(basePackages = { "org.ibase4j.web" })
 public class SwaggerConfig {
 
 	@Bean
 	public Docket platformApi() {
-		return new Docket(DocumentationType.SWAGGER_2).groupName("full-platform").apiInfo(apiInfo())
-				.forCodeGeneration(true);
+		return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).forCodeGeneration(true);
 	}
 
 	private ApiInfo apiInfo() {
@@ -32,5 +33,4 @@ private ApiInfo apiInfo() {
 				.contact(new Contact("iBase4J", "", "iBase4J@163.com")).license("Apache License Version 2.0")
 				.licenseUrl("https://github.com/springfox/springfox/blob/master/LICENSE").version("2.0").build();
 	}
-
 }

iBase4J-Biz-Web/src/main/java/org/ibase4j/core/shiro/Realm.java

@@ -46,9 +46,9 @@ public class Realm extends AuthorizingRealm {
 	protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
 		SimpleAuthorizationInfo info = new SimpleAuthorizationInfo();
 		Long userId = (Long) WebUtil.getCurrentUser();
-		Parameter parameter = new Parameter("sysAuthorizeService", "queryPermissionByUserId").setId(userId);
+		Parameter parameter = new Parameter("sysAuthorizeService", "queryPermissionByUserId", userId);
 		logger.info("{} execute queryPermissionByUserId start...", parameter.getNo());
-		List<?> list = provider.execute(parameter).getList();
+		List<?> list = provider.execute(parameter).getResultList();
 		logger.info("{} execute queryPermissionByUserId end.", parameter.getNo());
 		for (Object permission : list) {
 			if (StringUtils.isNotBlank((String) permission)) {
@@ -68,9 +68,9 @@ protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authcTo
 		Map<String, Object> params = new HashMap<String, Object>();
 		params.put("enable", 1);
 		params.put("account", token.getUsername());
-		Parameter parameter = new Parameter("sysUserService", "queryList").setMap(params);
+		Parameter parameter = new Parameter("sysUserService", "queryList", params);
 		logger.info("{} execute sysUserService.queryList start...", parameter.getNo());
-		List<?> list = provider.execute(parameter).getList();
+		List<?> list = provider.execute(parameter).getResultList();
 		logger.info("{} execute sysUserService.queryList end.", parameter.getNo());
 		if (list.size() == 1) {
 			SysUser user = (SysUser) list.get(0);
@@ -98,17 +98,17 @@ private void saveSession(String account, String host) {
 		// 踢出用户
 		SysSession record = new SysSession();
 		record.setAccount(account);
-		Parameter parameter = new Parameter("sysSessionService", "querySessionIdByAccount").setModel(record);
+		Parameter parameter = new Parameter("sysSessionService", "querySessionIdByAccount", record);
 		logger.info("{} execute querySessionIdByAccount start...", parameter.getNo());
-		List<?> sessionIds = provider.execute(parameter).getList();
+		List<?> sessionIds = provider.execute(parameter).getResultList();
 		logger.info("{} execute querySessionIdByAccount end.", parameter.getNo());
 		Subject currentUser = SecurityUtils.getSubject();
 		Session session = currentUser.getSession();
 		String currentSessionId = session.getId().toString();
 		if (sessionIds != null) {
 			for (Object sessionId : sessionIds) {
 				record.setSessionId((String) sessionId);
-				parameter = new Parameter("sysSessionService", "deleteBySessionId").setModel(record);
+				parameter = new Parameter("sysSessionService", "deleteBySessionId", record);
 				logger.info("{} execute deleteBySessionId start...", parameter.getNo());
 				provider.execute(parameter);
 				logger.info("{} execute deleteBySessionId end.", parameter.getNo());
@@ -122,7 +122,7 @@ private void saveSession(String account, String host) {
 		record.setSessionId(currentSessionId);
 		record.setIp(StringUtils.isBlank(host) ? session.getHost() : host);
 		record.setStartTime(session.getStartTimestamp());
-		parameter = new Parameter("sysSessionService", "update").setModel(record);
+		parameter = new Parameter("sysSessionService", "update", record);
 		logger.info("{} execute sysSessionService.update start...", parameter.getNo());
 		provider.execute(parameter);
 		logger.info("{} execute sysSessionService.update end.", parameter.getNo());

iBase4J-Biz-Web/src/main/java/org/ibase4j/web/LoginController.java

@@ -31,7 +31,6 @@
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 
 /**
  * 用户登录
@@ -50,8 +49,10 @@ public String getService() {
 	// 登录
 	@ApiOperation(value = "用户登录")
 	@PostMapping("app/login")
-	public Object login(@ApiParam(required = true, value = "登录帐号和密码") @RequestBody Login user, ModelMap modelMap,
-			HttpServletRequest request) {
+	public Object login(Login user, ModelMap modelMap, HttpServletRequest request) {
+		String uuid = request.getHeader("UUID");
+		org.springframework.util.Assert.notNull(uuid, "非法操作.");
+		user = WebUtil.getParameter(request, Login.class);
 		Assert.notNull(user.getAccount(), "ACCOUNT");
 		Assert.notNull(user.getPassword(), "PASSWORD");
 
@@ -68,8 +69,8 @@ public Object login(@ApiParam(required = true, value = "登录帐号和密码")
 			params.put("countSql", 0);
 			params.put("enable", 1);
 			params.put("loginKey", user.getAccount()); // 登录帐号/手机号/邮箱
-			Parameter parameter = new Parameter(getService(), "query").setMap(params);
-			Page<?> pageInfo = provider.execute(parameter).getPage();
+			Parameter parameter = new Parameter(getService(), "query", params);
+			Page<?> pageInfo = provider.execute(parameter).getResultPage();
 			if (pageInfo.getTotal() == 1) {
 				SysUser sysUser = (SysUser) pageInfo.getRecords().get(0);
 				if (user.getPassword().equals(SecurityUtil.encryptPassword(user.getPassword()))) {
@@ -81,9 +82,7 @@ public Object login(@ApiParam(required = true, value = "登录帐号和密码")
 
 		if (success) {
 			request.setAttribute("msg", "[" + user.getAccount() + "]登录成功.");
-			String token = SecurityUtil.encryptPassword(user.getAccount() + DateUtil.getDateTime("yyyyMMddHHmmss"));
-			TokenUtil.setTokenInfo(token, user.getAccount());
-			modelMap.put("token", token);
+			TokenUtil.setTokenInfo(uuid, user.getAccount());
 			return setSuccessModelMap(modelMap);
 		}
 		request.setAttribute("msg", "[" + user.getAccount() + "]登录失败.");
@@ -94,9 +93,9 @@ public Object login(@ApiParam(required = true, value = "登录帐号和密码")
 	@ApiOperation(value = "用户登出")
 	@PostMapping("app/logout")
 	public Object logout(HttpServletRequest request, ModelMap modelMap) {
-		String token = request.getHeader("token");
-		if (StringUtils.isNotBlank(token)) {
-			TokenUtil.delToken(token);
+		String uuid = request.getHeader("UUID");
+		if (StringUtils.isNotBlank(uuid)) {
+			TokenUtil.delToken(uuid);
 		}
 		return setSuccessModelMap(modelMap);
 	}
@@ -108,7 +107,7 @@ public Object regin(ModelMap modelMap, @RequestBody SysUser sysUser) {
 		Assert.notNull(sysUser.getAccount(), "ACCOUNT");
 		Assert.notNull(sysUser.getPassword(), "PASSWORD");
 		sysUser.setPassword(SecurityUtil.encryptPassword(sysUser.getPassword()));
-		provider.execute(new Parameter("sysUserService", "update").setModel(sysUser));
+		provider.execute(new Parameter("sysUserService", "update", sysUser));
 		try {
 			String token = SecurityUtil.encryptPassword(sysUser.getAccount() + DateUtil.getDateTime("yyyyMMddHHmmss"));
 			TokenUtil.setTokenInfo(token, sysUser.getAccount());

iBase4J-Biz-Web/src/main/resources/Spring-config.xml

@@ -20,7 +20,7 @@
 		<property name="properties">
 			<props>
 				<!-- dubbo个性化配置(服务名,端口) -->
-				<prop key="rpc.application.name">${project.artifactId}</prop>
+				<prop key="rpc.registry.name">${project.artifactId}</prop>
 				<prop key="rpc.protocol.port">1${server.port}</prop>
 			</props>
 		</property>
@@ -31,14 +31,14 @@
 		<context:exclude-filter type="annotation" expression="org.springframework.cache.annotation.EnableCaching" />
 	</context:component-scan>
 	<!-- dubbo -->
-	<dubbo:reference id="sysProvider" interface="org.ibase4j.provider.ISysProvider" check="false" />
-	<dubbo:reference id="bizProvider" interface="org.ibase4j.provider.IBizProvider" check="false" />
-	<!-- <motan:referer id="sysProvider" interface="org.ibase4j.provider.ISysProvider" check="false" />
-	<motan:referer id="bizProvider" interface="org.ibase4j.provider.IBizProvider" check="false" /> -->
+	<!-- <dubbo:reference id="sysProvider" interface="org.ibase4j.provider.ISysProvider" check="false" />
+	<dubbo:reference id="bizProvider" interface="org.ibase4j.provider.IBizProvider" check="false" /> -->
+	<motan:referer id="sysProvider" interface="org.ibase4j.provider.ISysProvider" check="false" />
+	<motan:referer id="bizProvider" interface="org.ibase4j.provider.IBizProvider" check="false" />
 	<!-- 引入SPRING配置文件 -->
 	<!-- <import resource="spring/mq.xml"/> -->
-	<import resource="spring/dubbo.xml" />
-	<!-- <import resource="spring/motan.xml" /> -->
+	<!-- <import resource="spring/dubbo.xml" /> -->
+	<import resource="spring/motan.xml" />
 	<import resource="spring/redis.xml" />
 	<import resource="spring/session.xml" />
 	<import resource="spring/shiro.xml" />