sz

pom.xml

@@ -1,264 +1,264 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.1.RELEASE</version>
-		<relativePath/> <!-- lookup parent from repository -->
-	</parent>
-	<groupId>com.jpsoft</groupId>
-	<artifactId>epay-server</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<name>epay-server</name>
-	<description>电表缴费</description>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.1.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <groupId>com.jpsoft</groupId>
+    <artifactId>smart-community-server</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>smart-community-server</name>
+    <description>智慧小区</description>
 
-	<properties>
-		<java.version>1.8</java.version>
-		<swagger2.version>2.7.0</swagger2.version>
-		<jwts.version>0.10.5</jwts.version>
-		<netty-all.version>4.1.6.Final</netty-all.version>
-		<lombok.version>1.16.12</lombok.version>
-		<fastjson.version>1.2.29</fastjson.version>
-		<alipay.version>4.8.10.ALL</alipay.version>
-		<ijpay.version>2.3.2</ijpay.version>
-	</properties>
+    <properties>
+        <java.version>1.8</java.version>
+        <swagger2.version>2.7.0</swagger2.version>
+        <jwts.version>0.10.5</jwts.version>
+        <netty-all.version>4.1.6.Final</netty-all.version>
+        <lombok.version>1.16.12</lombok.version>
+        <fastjson.version>1.2.29</fastjson.version>
+        <alipay.version>4.8.10.ALL</alipay.version>
+        <ijpay.version>2.3.2</ijpay.version>
+    </properties>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-devtools</artifactId>
-			<scope>runtime</scope>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<optional>true</optional>
-		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
 
-<!--		<dependency>-->
-<!--			<groupId>org.slf4j</groupId>-->
-<!--			<artifactId>slf4j-api</artifactId>-->
-<!--			<version>1.7.25</version>-->
-<!--		</dependency>-->
+        <!--		<dependency>-->
+        <!--			<groupId>org.slf4j</groupId>-->
+        <!--			<artifactId>slf4j-api</artifactId>-->
+        <!--			<version>1.7.25</version>-->
+        <!--		</dependency>-->
 
-<!--		<dependency>-->
-<!--			<groupId>org.slf4j</groupId>-->
-<!--			<artifactId>slf4j-log4j12</artifactId>-->
-<!--			<version>1.7.25</version>-->
-<!--		</dependency>-->
+        <!--		<dependency>-->
+        <!--			<groupId>org.slf4j</groupId>-->
+        <!--			<artifactId>slf4j-log4j12</artifactId>-->
+        <!--			<version>1.7.25</version>-->
+        <!--		</dependency>-->
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.junit.vintage</groupId>
-					<artifactId>junit-vintage-engine</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-aop</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger2</artifactId>
-			<version>${swagger2.version}</version>
-		</dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>${swagger2.version}</version>
+        </dependency>
 
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger-ui</artifactId>
-			<version>${swagger2.version}</version>
-		</dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger2.version}</version>
+        </dependency>
 
-		<!--jwt start-->
-		<dependency>
-			<groupId>io.jsonwebtoken</groupId>
-			<artifactId>jjwt-api</artifactId>
-			<version>0.10.5</version>
-		</dependency>
-		<dependency>
-			<groupId>io.jsonwebtoken</groupId>
-			<artifactId>jjwt-impl</artifactId>
-			<version>${jwts.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>io.jsonwebtoken</groupId>
-			<artifactId>jjwt-jackson</artifactId>
-			<version>${jwts.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-		<!--jwt end-->
+        <!--jwt start-->
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-api</artifactId>
+            <version>0.10.5</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-impl</artifactId>
+            <version>${jwts.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-jackson</artifactId>
+            <version>${jwts.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <!--jwt end-->
 
-		<!--logging start-->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-logging</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.lazyluke</groupId>
-			<artifactId>log4jdbc-remix</artifactId>
-			<version>0.2.7</version>
-		</dependency>
-		<!--logging end-->
+        <!--logging start-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.lazyluke</groupId>
+            <artifactId>log4jdbc-remix</artifactId>
+            <version>0.2.7</version>
+        </dependency>
+        <!--logging end-->
 
-		<dependency>
-			<groupId>io.netty</groupId>
-			<artifactId>netty-all</artifactId>
-			<version>${netty-all.version}</version>
-		</dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>${netty-all.version}</version>
+        </dependency>
 
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>${lombok.version}</version>
-		</dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+        </dependency>
 
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>fastjson</artifactId>
-			<version>${fastjson.version}</version>
-		</dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>${fastjson.version}</version>
+        </dependency>
 
-		<dependency>
-			<groupId>com.github.dozermapper</groupId>
-			<artifactId>dozer-core</artifactId>
-			<version>6.4.1</version>
-		</dependency>
+        <dependency>
+            <groupId>com.github.dozermapper</groupId>
+            <artifactId>dozer-core</artifactId>
+            <version>6.4.1</version>
+        </dependency>
 
-		<!-- 数据库相关 start-->
-		<dependency>
-			<groupId>org.mybatis.spring.boot</groupId>
-			<artifactId>mybatis-spring-boot-starter</artifactId>
-			<version>2.0.1</version>
-		</dependency>
+        <!-- 数据库相关 start-->
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>2.0.1</version>
+        </dependency>
 
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<scope>runtime</scope>
-		</dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
 
-		<dependency>
-			<groupId>com.github.pagehelper</groupId>
-			<artifactId>pagehelper-spring-boot-starter</artifactId>
-			<version>LATEST</version>
-		</dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>LATEST</version>
+        </dependency>
 
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>druid-spring-boot-starter</artifactId>
-			<version>1.1.10</version>
-		</dependency>
-		<!-- 数据库相关 end-->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.1.10</version>
+        </dependency>
+        <!-- 数据库相关 end-->
 
-		<!--支付相关 start-->
-		<dependency>
-			<groupId>com.github.javen205</groupId>
-			<artifactId>IJPay-All</artifactId>
-			<version>${ijpay.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.jfinal</groupId>
-			<artifactId>jfinal</artifactId>
-			<version>3.5</version>
-		</dependency>
-		<dependency>
-			<groupId>com.alipay.sdk</groupId>
-			<artifactId>alipay-sdk-java</artifactId>
-			<version>${alipay.version}</version>
-		</dependency>
-		<!--支付相关 end-->
+        <!--支付相关 start-->
+        <dependency>
+            <groupId>com.github.javen205</groupId>
+            <artifactId>IJPay-All</artifactId>
+            <version>${ijpay.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.jfinal</groupId>
+            <artifactId>jfinal</artifactId>
+            <version>3.5</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alipay.sdk</groupId>
+            <artifactId>alipay-sdk-java</artifactId>
+            <version>${alipay.version}</version>
+        </dependency>
+        <!--支付相关 end-->
 
-		<dependency>
-			<groupId>cn.hutool</groupId>
-			<artifactId>hutool-all</artifactId>
-			<version>5.0.6</version>
-		</dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.0.6</version>
+        </dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-redis</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<fork>true</fork>
-					<addResources>true</addResources>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.16</version>
-				<configuration>
-					<includes>
-						<include>**/*TestForPack.java</include>
-					</includes>
-					<argLine>-Xmx256M</argLine>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>org.apache.maven.surefire</groupId>
-						<artifactId>surefire-junit47</artifactId>
-						<version>2.16</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-		</plugins>
-	</build>
-	<profiles>
-		<profile>
-			<id>dev</id>
-			<dependencies>
-				<dependency>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-tomcat</artifactId>
-				</dependency>
-			</dependencies>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<properties>
-				<active.profile>dev</active.profile>
-			</properties>
-		</profile>
-		<profile>
-			<id>test</id>
-			<dependencies>
-				<dependency>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-tomcat</artifactId>
-					<scope>provided</scope>
-				</dependency>
-			</dependencies>
-			<properties>
-				<active.profile>test</active.profile>
-			</properties>
-		</profile>
-		<profile>
-			<id>production</id>
-			<properties>
-				<active.profile>production</active.profile>
-			</properties>
-		</profile>
-	</profiles>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <fork>true</fork>
+                    <addResources>true</addResources>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.16</version>
+                <configuration>
+                    <includes>
+                        <include>**/*TestForPack.java</include>
+                    </includes>
+                    <argLine>-Xmx256M</argLine>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit47</artifactId>
+                        <version>2.16</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </dependency>
+            </dependencies>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <active.profile>dev</active.profile>
+            </properties>
+        </profile>
+        <profile>
+            <id>test</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <active.profile>test</active.profile>
+            </properties>
+        </profile>
+        <profile>
+            <id>production</id>
+            <properties>
+                <active.profile>production</active.profile>
+            </properties>
+        </profile>
+    </profiles>
 </project>

src/main/java/com/jpsoft/epay/EPayServerApplication.java

@@ -1,33 +0,0 @@
-package com.jpsoft.epay;
-
-import com.jpsoft.epay.modules.communication.server.TcpServer;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-@SpringBootApplication
-@EnableTransactionManagement
-@MapperScan("com.jpsoft.epay.**.dao")
-public class EPayServerApplication implements CommandLineRunner {
-	@Autowired
-	private TcpServer tcpServer;
-
-	public static void main(String[] args) {
-		SpringApplication.run(EPayServerApplication.class, args);
-	}
-
-	@Override
-	public void run(String... args) throws Exception {
-		tcpServer.start();
-
-		Runtime.getRuntime().addShutdownHook(new Thread(){
-			@Override
-			public void run() {
-				tcpServer.stop();
-			}
-		});
-	}
-}

src/main/java/com/jpsoft/epay/advice/PermissionAdvice.java → src/main/java/com/jpsoft/smart/advice/PermissionAdvice.java

@@ -1,7 +1,7 @@
-package com.jpsoft.epay.advice;
+package com.jpsoft.smart.advice;
 
-import com.jpsoft.epay.modules.common.dto.MessageResult;
-import com.jpsoft.epay.modules.sys.service.PermissionService;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.sys.service.PermissionService;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;

src/main/java/com/jpsoft/epay/config/NettyConfig.java → src/main/java/com/jpsoft/smart/config/NettyConfig.java

@@ -1,7 +1,7 @@
-package com.jpsoft.epay.config;
+package com.jpsoft.smart.config;
 
-import com.jpsoft.epay.modules.communication.server.ChannelWrapper;
-import com.jpsoft.epay.modules.communication.server.ServerChannelInitializer;
+import com.jpsoft.smart.modules.communication.server.ChannelWrapper;
+import com.jpsoft.smart.modules.communication.server.ServerChannelInitializer;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.nio.NioServerSocketChannel;

src/main/java/com/jpsoft/epay/config/NettyParamConfig.java → src/main/java/com/jpsoft/smart/config/NettyParamConfig.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.config;
+package com.jpsoft.smart.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

src/main/java/com/jpsoft/epay/config/RedisConfig.java → src/main/java/com/jpsoft/smart/config/RedisConfig.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.config;
+package com.jpsoft.smart.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.CacheManager;

src/main/java/com/jpsoft/epay/config/SwaggerConfig.java → src/main/java/com/jpsoft/smart/config/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.config;
+package com.jpsoft.smart.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/jpsoft/epay/config/WebMvcConfig.java → src/main/java/com/jpsoft/smart/config/WebMvcConfig.java

@@ -1,6 +1,6 @@
-package com.jpsoft.epay.config;
+package com.jpsoft.smart.config;
 
-import com.jpsoft.epay.interceptor.LoginInterceptor;
+import com.jpsoft.smart.interceptor.LoginInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.*;

src/main/java/com/jpsoft/epay/interceptor/LoginInterceptor.java → src/main/java/com/jpsoft/smart/interceptor/LoginInterceptor.java

@@ -1,7 +1,7 @@
-package com.jpsoft.epay.interceptor;
+package com.jpsoft.smart.interceptor;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jpsoft.epay.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.security.Keys;

src/main/java/com/jpsoft/epay/modules/base/controller/ElectricClientInfoController.java → src/main/java/com/jpsoft/smart/modules/base/controller/ElectricClientInfoController.java

@@ -1,13 +1,13 @@
-package com.jpsoft.epay.modules.base.controller;
+package com.jpsoft.smart.modules.base.controller;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.base.entity.ElectricClientInfo;
-import com.jpsoft.epay.modules.base.entity.RoomInfo;
-import com.jpsoft.epay.modules.base.service.ElectricClientInfoService;
-import com.jpsoft.epay.modules.base.service.RoomInfoService;
-import com.jpsoft.epay.modules.common.dto.MessageResult;
-import com.jpsoft.epay.modules.common.dto.Sort;
-import com.jpsoft.epay.modules.sys.service.DataDictionaryService;
+import com.jpsoft.smart.modules.base.entity.ElectricClientInfo;
+import com.jpsoft.smart.modules.base.entity.RoomInfo;
+import com.jpsoft.smart.modules.base.service.ElectricClientInfoService;
+import com.jpsoft.smart.modules.base.service.RoomInfoService;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.sys.service.DataDictionaryService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.util.*;
 
 @RestController
 @RequestMapping("/base/electricClientInfo")
@@ -187,7 +188,7 @@ public class ElectricClientInfoController {
 
     @ApiOperation(value="批量删除")
     @PostMapping("batchDelete")
-    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList, @RequestAttribute String subject){
         MessageResult<Integer> msgResult = new MessageResult<>();
 
         try {

src/main/java/com/jpsoft/epay/modules/base/controller/ElectricMeterInfoController.java → src/main/java/com/jpsoft/smart/modules/base/controller/ElectricMeterInfoController.java

@@ -1,11 +1,11 @@
-package com.jpsoft.epay.modules.base.controller;
+package com.jpsoft.smart.modules.base.controller;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.base.entity.ElectricMeterInfo;
-import com.jpsoft.epay.modules.base.service.ElectricMeterInfoService;
-import com.jpsoft.epay.modules.common.dto.MessageResult;
-import com.jpsoft.epay.modules.common.dto.Sort;
-import com.jpsoft.epay.modules.common.utils.PojoUtils;
+import com.jpsoft.smart.modules.base.entity.ElectricMeterInfo;
+import com.jpsoft.smart.modules.base.service.ElectricMeterInfoService;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.utils.PojoUtils;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

src/main/java/com/jpsoft/epay/modules/base/controller/RechargeRecordController.java → src/main/java/com/jpsoft/smart/modules/base/controller/RechargeRecordController.java

@@ -1,15 +1,15 @@
-package com.jpsoft.epay.modules.base.controller;
+package com.jpsoft.smart.modules.base.controller;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.base.entity.*;
-import com.jpsoft.epay.modules.base.service.*;
-import com.jpsoft.epay.modules.business.service.RechargeService;
-import com.jpsoft.epay.modules.common.dto.MessageResult;
-import com.jpsoft.epay.modules.common.dto.Sort;
-import com.jpsoft.epay.modules.common.utils.StringUtils;
-import com.jpsoft.epay.modules.communication.server.protocol.MeterReceivePacket;
-import com.jpsoft.epay.modules.sys.entity.DataDictionary;
-import com.jpsoft.epay.modules.sys.service.DataDictionaryService;
+import com.jpsoft.smart.modules.base.entity.*;
+import com.jpsoft.smart.modules.base.service.*;
+import com.jpsoft.smart.modules.business.service.RechargeService;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.utils.StringUtils;
+import com.jpsoft.smart.modules.communication.server.protocol.MeterReceivePacket;
+import com.jpsoft.smart.modules.sys.entity.DataDictionary;
+import com.jpsoft.smart.modules.sys.service.DataDictionaryService;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/jpsoft/epay/modules/base/controller/RoomInfoController.java → src/main/java/com/jpsoft/smart/modules/base/controller/RoomInfoController.java

@@ -1,12 +1,12 @@
-package com.jpsoft.epay.modules.base.controller;
+package com.jpsoft.smart.modules.base.controller;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.base.entity.RoomInfo;
-import com.jpsoft.epay.modules.base.service.ElectricClientInfoService;
-import com.jpsoft.epay.modules.base.service.RoomInfoService;
-import com.jpsoft.epay.modules.common.dto.MessageResult;
-import com.jpsoft.epay.modules.common.dto.Sort;
-import com.jpsoft.epay.modules.common.utils.PojoUtils;
+import com.jpsoft.smart.modules.base.entity.RoomInfo;
+import com.jpsoft.smart.modules.base.service.ElectricClientInfoService;
+import com.jpsoft.smart.modules.base.service.RoomInfoService;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.utils.PojoUtils;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

src/main/java/com/jpsoft/epay/modules/base/controller/TerminalInfoController.java → src/main/java/com/jpsoft/smart/modules/base/controller/TerminalInfoController.java

@@ -1,11 +1,11 @@
-package com.jpsoft.epay.modules.base.controller;
+package com.jpsoft.smart.modules.base.controller;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.base.entity.TerminalInfo;
-import com.jpsoft.epay.modules.base.service.TerminalInfoService;
-import com.jpsoft.epay.modules.common.dto.MessageResult;
-import com.jpsoft.epay.modules.common.dto.Sort;
-import com.jpsoft.epay.modules.common.utils.PojoUtils;
+import com.jpsoft.smart.modules.base.entity.TerminalInfo;
+import com.jpsoft.smart.modules.base.service.TerminalInfoService;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.utils.PojoUtils;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

src/main/java/com/jpsoft/epay/modules/base/dao/ElectricClientInfoDAO.java → src/main/java/com/jpsoft/smart/modules/base/dao/ElectricClientInfoDAO.java

@@ -1,7 +1,7 @@
-package com.jpsoft.epay.modules.base.dao;
+package com.jpsoft.smart.modules.base.dao;
 
-import com.jpsoft.epay.modules.base.entity.ElectricClientInfo;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.base.entity.ElectricClientInfo;
+import com.jpsoft.smart.modules.common.dto.Sort;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/jpsoft/epay/modules/base/dao/ElectricMeterInfoDAO.java → src/main/java/com/jpsoft/smart/modules/base/dao/ElectricMeterInfoDAO.java

@@ -1,7 +1,7 @@
-package com.jpsoft.epay.modules.base.dao;
+package com.jpsoft.smart.modules.base.dao;
 
-import com.jpsoft.epay.modules.base.entity.ElectricMeterInfo;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.base.entity.ElectricMeterInfo;
+import com.jpsoft.smart.modules.common.dto.Sort;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

src/main/java/com/jpsoft/epay/modules/base/dao/RechargeRecordDAO.java → src/main/java/com/jpsoft/smart/modules/base/dao/RechargeRecordDAO.java

@@ -1,7 +1,7 @@
-package com.jpsoft.epay.modules.base.dao;
+package com.jpsoft.smart.modules.base.dao;
 
-import com.jpsoft.epay.modules.base.entity.RechargeRecord;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.base.entity.RechargeRecord;
+import com.jpsoft.smart.modules.common.dto.Sort;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

src/main/java/com/jpsoft/epay/modules/base/dao/RoomInfoDAO.java → src/main/java/com/jpsoft/smart/modules/base/dao/RoomInfoDAO.java

@@ -1,7 +1,7 @@
-package com.jpsoft.epay.modules.base.dao;
+package com.jpsoft.smart.modules.base.dao;
 
-import com.jpsoft.epay.modules.base.entity.RoomInfo;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.base.entity.RoomInfo;
+import com.jpsoft.smart.modules.common.dto.Sort;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

src/main/java/com/jpsoft/epay/modules/base/dao/TerminalInfoDAO.java → src/main/java/com/jpsoft/smart/modules/base/dao/TerminalInfoDAO.java

@@ -1,10 +1,10 @@
-package com.jpsoft.epay.modules.base.dao;
+package com.jpsoft.smart.modules.base.dao;
 
 import java.util.List;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.epay.modules.base.entity.TerminalInfo;
+import com.jpsoft.smart.modules.base.entity.TerminalInfo;
 import java.util.Map;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.dto.Sort;
 
 @Repository
 public interface TerminalInfoDAO {

src/main/java/com/jpsoft/epay/modules/base/entity/ElectricClientInfo.java → src/main/java/com/jpsoft/smart/modules/base/entity/ElectricClientInfo.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.base.entity;
+package com.jpsoft.smart.modules.base.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;

src/main/java/com/jpsoft/epay/modules/base/entity/ElectricMeterInfo.java → src/main/java/com/jpsoft/smart/modules/base/entity/ElectricMeterInfo.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.base.entity;
+package com.jpsoft.smart.modules.base.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;

src/main/java/com/jpsoft/epay/modules/base/entity/RechargeRecord.java → src/main/java/com/jpsoft/smart/modules/base/entity/RechargeRecord.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.base.entity;
+package com.jpsoft.smart.modules.base.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;

src/main/java/com/jpsoft/epay/modules/base/entity/RoomInfo.java → src/main/java/com/jpsoft/smart/modules/base/entity/RoomInfo.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.base.entity;
+package com.jpsoft.smart.modules.base.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;

src/main/java/com/jpsoft/epay/modules/base/entity/TerminalInfo.java → src/main/java/com/jpsoft/smart/modules/base/entity/TerminalInfo.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.base.entity;
+package com.jpsoft.smart.modules.base.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;

src/main/java/com/jpsoft/epay/modules/base/service/ElectricClientInfoService.java → src/main/java/com/jpsoft/smart/modules/base/service/ElectricClientInfoService.java

@@ -1,8 +1,8 @@
-package com.jpsoft.epay.modules.base.service;
+package com.jpsoft.smart.modules.base.service;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.base.entity.ElectricClientInfo;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.base.entity.ElectricClientInfo;
+import com.jpsoft.smart.modules.common.dto.Sort;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/jpsoft/epay/modules/base/service/ElectricMeterInfoService.java → src/main/java/com/jpsoft/smart/modules/base/service/ElectricMeterInfoService.java

@@ -1,8 +1,8 @@
-package com.jpsoft.epay.modules.base.service;
+package com.jpsoft.smart.modules.base.service;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.base.entity.ElectricMeterInfo;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.base.entity.ElectricMeterInfo;
+import com.jpsoft.smart.modules.common.dto.Sort;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/jpsoft/epay/modules/base/service/RechargeRecordService.java → src/main/java/com/jpsoft/smart/modules/base/service/RechargeRecordService.java

@@ -1,8 +1,8 @@
-package com.jpsoft.epay.modules.base.service;
+package com.jpsoft.smart.modules.base.service;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.base.entity.RechargeRecord;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.base.entity.RechargeRecord;
+import com.jpsoft.smart.modules.common.dto.Sort;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/jpsoft/epay/modules/base/service/RoomInfoService.java → src/main/java/com/jpsoft/smart/modules/base/service/RoomInfoService.java

@@ -1,8 +1,8 @@
-package com.jpsoft.epay.modules.base.service;
+package com.jpsoft.smart.modules.base.service;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.base.entity.RoomInfo;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.base.entity.RoomInfo;
+import com.jpsoft.smart.modules.common.dto.Sort;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

src/main/java/com/jpsoft/epay/modules/base/service/TerminalInfoService.java → src/main/java/com/jpsoft/smart/modules/base/service/TerminalInfoService.java

@@ -1,8 +1,8 @@
-package com.jpsoft.epay.modules.base.service;
+package com.jpsoft.smart.modules.base.service;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.base.entity.TerminalInfo;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.base.entity.TerminalInfo;
+import com.jpsoft.smart.modules.common.dto.Sort;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/jpsoft/epay/modules/base/service/impl/ElectricClientInfoServiceImpl.java → src/main/java/com/jpsoft/smart/modules/base/service/impl/ElectricClientInfoServiceImpl.java

@@ -1,11 +1,11 @@
-package com.jpsoft.epay.modules.base.service.impl;
+package com.jpsoft.smart.modules.base.service.impl;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import com.jpsoft.epay.modules.base.dao.ElectricClientInfoDAO;
-import com.jpsoft.epay.modules.base.entity.ElectricClientInfo;
-import com.jpsoft.epay.modules.base.service.ElectricClientInfoService;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.base.dao.ElectricClientInfoDAO;
+import com.jpsoft.smart.modules.base.entity.ElectricClientInfo;
+import com.jpsoft.smart.modules.base.service.ElectricClientInfoService;
+import com.jpsoft.smart.modules.common.dto.Sort;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/com/jpsoft/epay/modules/base/service/impl/ElectricMeterInfoServiceImpl.java → src/main/java/com/jpsoft/smart/modules/base/service/impl/ElectricMeterInfoServiceImpl.java

@@ -1,11 +1,11 @@
-package com.jpsoft.epay.modules.base.service.impl;
+package com.jpsoft.smart.modules.base.service.impl;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import com.jpsoft.epay.modules.base.dao.ElectricMeterInfoDAO;
-import com.jpsoft.epay.modules.base.entity.ElectricMeterInfo;
-import com.jpsoft.epay.modules.base.service.ElectricMeterInfoService;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.base.dao.ElectricMeterInfoDAO;
+import com.jpsoft.smart.modules.base.entity.ElectricMeterInfo;
+import com.jpsoft.smart.modules.base.service.ElectricMeterInfoService;
+import com.jpsoft.smart.modules.common.dto.Sort;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/com/jpsoft/epay/modules/base/service/impl/RechargeRecordServiceImpl.java → src/main/java/com/jpsoft/smart/modules/base/service/impl/RechargeRecordServiceImpl.java

@@ -1,11 +1,11 @@
-package com.jpsoft.epay.modules.base.service.impl;
+package com.jpsoft.smart.modules.base.service.impl;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import com.jpsoft.epay.modules.base.dao.RechargeRecordDAO;
-import com.jpsoft.epay.modules.base.entity.RechargeRecord;
-import com.jpsoft.epay.modules.base.service.RechargeRecordService;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.base.dao.RechargeRecordDAO;
+import com.jpsoft.smart.modules.base.entity.RechargeRecord;
+import com.jpsoft.smart.modules.base.service.RechargeRecordService;
+import com.jpsoft.smart.modules.common.dto.Sort;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/com/jpsoft/epay/modules/base/service/impl/RoomInfoServiceImpl.java → src/main/java/com/jpsoft/smart/modules/base/service/impl/RoomInfoServiceImpl.java

@@ -1,13 +1,13 @@
-package com.jpsoft.epay.modules.base.service.impl;
+package com.jpsoft.smart.modules.base.service.impl;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import com.jpsoft.epay.modules.base.dao.ElectricClientInfoDAO;
-import com.jpsoft.epay.modules.base.dao.RoomInfoDAO;
-import com.jpsoft.epay.modules.base.entity.ElectricClientInfo;
-import com.jpsoft.epay.modules.base.entity.RoomInfo;
-import com.jpsoft.epay.modules.base.service.RoomInfoService;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.base.dao.ElectricClientInfoDAO;
+import com.jpsoft.smart.modules.base.dao.RoomInfoDAO;
+import com.jpsoft.smart.modules.base.entity.ElectricClientInfo;
+import com.jpsoft.smart.modules.base.entity.RoomInfo;
+import com.jpsoft.smart.modules.base.service.RoomInfoService;
+import com.jpsoft.smart.modules.common.dto.Sort;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/com/jpsoft/epay/modules/base/service/impl/TerminalInfoServiceImpl.java → src/main/java/com/jpsoft/smart/modules/base/service/impl/TerminalInfoServiceImpl.java

@@ -1,11 +1,11 @@
-package com.jpsoft.epay.modules.base.service.impl;
+package com.jpsoft.smart.modules.base.service.impl;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import com.jpsoft.epay.modules.base.dao.TerminalInfoDAO;
-import com.jpsoft.epay.modules.base.entity.TerminalInfo;
-import com.jpsoft.epay.modules.base.service.TerminalInfoService;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.base.dao.TerminalInfoDAO;
+import com.jpsoft.smart.modules.base.entity.TerminalInfo;
+import com.jpsoft.smart.modules.base.service.TerminalInfoService;
+import com.jpsoft.smart.modules.common.dto.Sort;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/com/jpsoft/epay/modules/business/controller/DemoController.java → src/main/java/com/jpsoft/smart/modules/business/controller/DemoController.java

@@ -1,9 +1,9 @@
-package com.jpsoft.epay.modules.business.controller;
+package com.jpsoft.smart.modules.business.controller;
 
-import com.jpsoft.epay.modules.communication.server.AttributeKeys;
-import com.jpsoft.epay.modules.communication.server.ChannelWrapper;
-import com.jpsoft.epay.modules.communication.server.protocol.MeterReceivePacket;
-import com.jpsoft.epay.modules.communication.server.protocol.MeterSendPacket;
+import com.jpsoft.smart.modules.communication.server.AttributeKeys;
+import com.jpsoft.smart.modules.communication.server.ChannelWrapper;
+import com.jpsoft.smart.modules.communication.server.protocol.MeterReceivePacket;
+import com.jpsoft.smart.modules.communication.server.protocol.MeterSendPacket;
 import io.netty.channel.Channel;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

src/main/java/com/jpsoft/epay/modules/business/controller/MobileApiController.java → src/main/java/com/jpsoft/smart/modules/business/controller/MobileApiController.java

@@ -1,20 +1,20 @@
-package com.jpsoft.epay.modules.business.controller;
+package com.jpsoft.smart.modules.business.controller;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.config.RedisConfig;
-import com.jpsoft.epay.modules.base.entity.*;
-import com.jpsoft.epay.modules.base.service.*;
-import com.jpsoft.epay.modules.business.service.RechargeService;
-import com.jpsoft.epay.modules.common.dto.MessageResult;
-import com.jpsoft.epay.modules.common.dto.Sort;
-import com.jpsoft.epay.modules.common.utils.StringUtils;
-import com.jpsoft.epay.modules.communication.server.ChannelWrapper;
-import com.jpsoft.epay.modules.communication.server.protocol.MeterReceivePacket;
-import com.jpsoft.epay.modules.communication.server.protocol.MeterSendPacket;
-import com.jpsoft.epay.modules.pay.properties.WxPayProperties;
-import com.jpsoft.epay.modules.sys.entity.DataDictionary;
-import com.jpsoft.epay.modules.sys.service.DataDictionaryService;
+import com.jpsoft.smart.config.RedisConfig;
+import com.jpsoft.smart.modules.base.entity.RechargeRecord;
+import com.jpsoft.smart.modules.base.entity.RoomInfo;
+import com.jpsoft.smart.modules.base.service.RechargeRecordService;
+import com.jpsoft.smart.modules.base.service.RoomInfoService;
+import com.jpsoft.smart.modules.business.service.RechargeService;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.utils.StringUtils;
+import com.jpsoft.smart.modules.communication.server.protocol.MeterReceivePacket;
+import com.jpsoft.smart.modules.pay.properties.WxPayProperties;
+import com.jpsoft.smart.modules.sys.entity.DataDictionary;
+import com.jpsoft.smart.modules.sys.service.DataDictionaryService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -60,7 +60,7 @@ public class MobileApiController {
      * @return
      */
     @GetMapping("queryRoomList")
-    public MessageResult<List> queryRoomList(String type,String parentId){
+    public MessageResult<List> queryRoomList(String type, String parentId){
         MessageResult<List> msgResult = new MessageResult<>();
 
         try {

src/main/java/com/jpsoft/epay/modules/business/service/RechargeService.java → src/main/java/com/jpsoft/smart/modules/business/service/RechargeService.java

@@ -1,6 +1,6 @@
-package com.jpsoft.epay.modules.business.service;
+package com.jpsoft.smart.modules.business.service;
 
-import com.jpsoft.epay.modules.communication.server.protocol.MeterReceivePacket;
+import com.jpsoft.smart.modules.communication.server.protocol.MeterReceivePacket;
 
 import java.util.concurrent.TimeUnit;
 

src/main/java/com/jpsoft/epay/modules/business/service/impl/RechargeServiceImpl.java → src/main/java/com/jpsoft/smart/modules/business/service/impl/RechargeServiceImpl.java

@@ -1,16 +1,16 @@
-package com.jpsoft.epay.modules.business.service.impl;
-
-import com.jpsoft.epay.modules.base.entity.ElectricClientInfo;
-import com.jpsoft.epay.modules.base.entity.ElectricMeterInfo;
-import com.jpsoft.epay.modules.base.entity.TerminalInfo;
-import com.jpsoft.epay.modules.base.service.ElectricClientInfoService;
-import com.jpsoft.epay.modules.base.service.ElectricMeterInfoService;
-import com.jpsoft.epay.modules.base.service.RoomInfoService;
-import com.jpsoft.epay.modules.base.service.TerminalInfoService;
-import com.jpsoft.epay.modules.business.service.RechargeService;
-import com.jpsoft.epay.modules.communication.server.ChannelWrapper;
-import com.jpsoft.epay.modules.communication.server.protocol.MeterReceivePacket;
-import com.jpsoft.epay.modules.communication.server.protocol.MeterSendPacket;
+package com.jpsoft.smart.modules.business.service.impl;
+
+import com.jpsoft.smart.modules.base.entity.ElectricClientInfo;
+import com.jpsoft.smart.modules.base.entity.ElectricMeterInfo;
+import com.jpsoft.smart.modules.base.entity.TerminalInfo;
+import com.jpsoft.smart.modules.base.service.ElectricClientInfoService;
+import com.jpsoft.smart.modules.base.service.ElectricMeterInfoService;
+import com.jpsoft.smart.modules.base.service.RoomInfoService;
+import com.jpsoft.smart.modules.base.service.TerminalInfoService;
+import com.jpsoft.smart.modules.business.service.RechargeService;
+import com.jpsoft.smart.modules.communication.server.ChannelWrapper;
+import com.jpsoft.smart.modules.communication.server.protocol.MeterReceivePacket;
+import com.jpsoft.smart.modules.communication.server.protocol.MeterSendPacket;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import java.util.Date;

src/main/java/com/jpsoft/epay/modules/common/controller/JwtsUserController.java → src/main/java/com/jpsoft/smart/modules/common/controller/JwtsUserController.java

@@ -1,9 +1,9 @@
-package com.jpsoft.epay.modules.common.controller;
+package com.jpsoft.smart.modules.common.controller;
 
-import com.jpsoft.epay.modules.common.dto.MessageResult;
-import com.jpsoft.epay.modules.common.utils.DES3;
-import com.jpsoft.epay.modules.sys.entity.User;
-import com.jpsoft.epay.modules.sys.service.UserService;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.common.utils.DES3;
+import com.jpsoft.smart.modules.sys.entity.User;
+import com.jpsoft.smart.modules.sys.service.UserService;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.security.Keys;
 import io.swagger.annotations.ApiImplicitParam;

src/main/java/com/jpsoft/epay/modules/common/dto/MessageResult.java → src/main/java/com/jpsoft/smart/modules/common/dto/MessageResult.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.common.dto;
+package com.jpsoft.smart.modules.common.dto;
 
 public class MessageResult<T> {
 	private boolean result;

src/main/java/com/jpsoft/epay/modules/common/dto/Sort.java → src/main/java/com/jpsoft/smart/modules/common/dto/Sort.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.common.dto;
+package com.jpsoft.smart.modules.common.dto;
 
 import java.io.Serializable;
 

src/main/java/com/jpsoft/epay/modules/common/service/BaseService.java → src/main/java/com/jpsoft/smart/modules/common/service/BaseService.java

@@ -1,7 +1,7 @@
-package com.jpsoft.epay.modules.common.service;
+package com.jpsoft.smart.modules.common.service;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.dto.Sort;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/jpsoft/epay/modules/common/utils/Base64.java → src/main/java/com/jpsoft/smart/modules/common/utils/Base64.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.common.utils;
+package com.jpsoft.smart.modules.common.utils;
 
 public final class Base64 {
 

src/main/java/com/jpsoft/epay/modules/common/utils/DES3.java → src/main/java/com/jpsoft/smart/modules/common/utils/DES3.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.common.utils;
+package com.jpsoft.smart.modules.common.utils;
 
 import javax.crypto.Cipher;
 import javax.crypto.SecretKeyFactory;

src/main/java/com/jpsoft/epay/modules/common/utils/PojoUtils.java → src/main/java/com/jpsoft/smart/modules/common/utils/PojoUtils.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.common.utils;
+package com.jpsoft.smart.modules.common.utils;
 
 import com.github.dozermapper.core.DozerBeanMapperBuilder;
 import com.github.dozermapper.core.Mapper;

src/main/java/com/jpsoft/epay/modules/common/utils/StringUtils.java → src/main/java/com/jpsoft/smart/modules/common/utils/StringUtils.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.common.utils;
+package com.jpsoft.smart.modules.common.utils;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;

src/main/java/com/jpsoft/epay/modules/communication/server/AttributeKeys.java → src/main/java/com/jpsoft/smart/modules/communication/server/AttributeKeys.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.communication.server;
+package com.jpsoft.smart.modules.communication.server;
 
 import io.netty.util.AttributeKey;
 

src/main/java/com/jpsoft/epay/modules/communication/server/ChannelWrapper.java → src/main/java/com/jpsoft/smart/modules/communication/server/ChannelWrapper.java

@@ -1,6 +1,6 @@
-package com.jpsoft.epay.modules.communication.server;
+package com.jpsoft.smart.modules.communication.server;
 
-import com.jpsoft.epay.modules.communication.server.protocol.MeterReceivePacket;
+import com.jpsoft.smart.modules.communication.server.protocol.MeterReceivePacket;
 import io.netty.channel.Channel;
 
 import java.util.Map;

src/main/java/com/jpsoft/epay/modules/communication/server/ServerChannelInitializer.java → src/main/java/com/jpsoft/smart/modules/communication/server/ServerChannelInitializer.java

@@ -1,11 +1,11 @@
-package com.jpsoft.epay.modules.communication.server;
+package com.jpsoft.smart.modules.communication.server;
 
-import com.jpsoft.epay.modules.communication.server.codec.MeterDecodeHandler;
-import com.jpsoft.epay.modules.communication.server.codec.MeterEncodeHandler;
-import com.jpsoft.epay.modules.communication.server.handler.ActiveChannelHandler;
-import com.jpsoft.epay.modules.communication.server.handler.HeartbeatServerHandler;
-import com.jpsoft.epay.modules.communication.server.handler.IMIdleStateHandler;
-import com.jpsoft.epay.modules.communication.server.handler.MeterServerHandler;
+import com.jpsoft.smart.modules.communication.server.codec.MeterDecodeHandler;
+import com.jpsoft.smart.modules.communication.server.codec.MeterEncodeHandler;
+import com.jpsoft.smart.modules.communication.server.handler.ActiveChannelHandler;
+import com.jpsoft.smart.modules.communication.server.handler.HeartbeatServerHandler;
+import com.jpsoft.smart.modules.communication.server.handler.IMIdleStateHandler;
+import com.jpsoft.smart.modules.communication.server.handler.MeterServerHandler;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelInitializer;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/jpsoft/epay/modules/communication/server/TcpServer.java → src/main/java/com/jpsoft/smart/modules/communication/server/TcpServer.java

@@ -1,6 +1,6 @@
-package com.jpsoft.epay.modules.communication.server;
+package com.jpsoft.smart.modules.communication.server;
 
-import com.jpsoft.epay.config.NettyParamConfig;
+import com.jpsoft.smart.config.NettyParamConfig;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;

src/main/java/com/jpsoft/epay/modules/communication/server/codec/MeterDecodeHandler.java → src/main/java/com/jpsoft/smart/modules/communication/server/codec/MeterDecodeHandler.java

@@ -1,8 +1,8 @@
-package com.jpsoft.epay.modules.communication.server.codec;
+package com.jpsoft.smart.modules.communication.server.codec;
 
-import com.jpsoft.epay.modules.communication.server.AttributeKeys;
-import com.jpsoft.epay.modules.communication.server.protocol.HeartbeatReceivePacket;
-import com.jpsoft.epay.modules.communication.server.protocol.MeterReceivePacket;
+import com.jpsoft.smart.modules.communication.server.AttributeKeys;
+import com.jpsoft.smart.modules.communication.server.protocol.HeartbeatReceivePacket;
+import com.jpsoft.smart.modules.communication.server.protocol.MeterReceivePacket;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;

src/main/java/com/jpsoft/epay/modules/communication/server/codec/MeterEncodeHandler.java → src/main/java/com/jpsoft/smart/modules/communication/server/codec/MeterEncodeHandler.java

@@ -1,7 +1,7 @@
-package com.jpsoft.epay.modules.communication.server.codec;
+package com.jpsoft.smart.modules.communication.server.codec;
 
-import com.jpsoft.epay.modules.communication.server.AttributeKeys;
-import com.jpsoft.epay.modules.communication.server.protocol.MeterSendPacket;
+import com.jpsoft.smart.modules.communication.server.AttributeKeys;
+import com.jpsoft.smart.modules.communication.server.protocol.MeterSendPacket;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;

src/main/java/com/jpsoft/epay/modules/communication/server/handler/ActiveChannelHandler.java → src/main/java/com/jpsoft/smart/modules/communication/server/handler/ActiveChannelHandler.java

@@ -1,7 +1,7 @@
-package com.jpsoft.epay.modules.communication.server.handler;
+package com.jpsoft.smart.modules.communication.server.handler;
 
-import com.jpsoft.epay.modules.communication.server.AttributeKeys;
-import com.jpsoft.epay.modules.communication.server.ChannelWrapper;
+import com.jpsoft.smart.modules.communication.server.AttributeKeys;
+import com.jpsoft.smart.modules.communication.server.ChannelWrapper;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;

src/main/java/com/jpsoft/epay/modules/communication/server/handler/HeartbeatServerHandler.java → src/main/java/com/jpsoft/smart/modules/communication/server/handler/HeartbeatServerHandler.java

@@ -1,13 +1,11 @@
-package com.jpsoft.epay.modules.communication.server.handler;
+package com.jpsoft.smart.modules.communication.server.handler;
 
-import com.jpsoft.epay.modules.communication.server.AttributeKeys;
-import com.jpsoft.epay.modules.communication.server.ChannelWrapper;
-import com.jpsoft.epay.modules.communication.server.protocol.HeartbeatReceivePacket;
-import com.jpsoft.epay.modules.communication.server.protocol.MeterReceivePacket;
+import com.jpsoft.smart.modules.communication.server.AttributeKeys;
+import com.jpsoft.smart.modules.communication.server.ChannelWrapper;
+import com.jpsoft.smart.modules.communication.server.protocol.HeartbeatReceivePacket;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
-import io.netty.util.AttributeKey;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

src/main/java/com/jpsoft/epay/modules/communication/server/handler/IMIdleStateHandler.java → src/main/java/com/jpsoft/smart/modules/communication/server/handler/IMIdleStateHandler.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.communication.server.handler;
+package com.jpsoft.smart.modules.communication.server.handler;
 
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.timeout.IdleStateEvent;

src/main/java/com/jpsoft/epay/modules/communication/server/handler/MeterServerHandler.java → src/main/java/com/jpsoft/smart/modules/communication/server/handler/MeterServerHandler.java

@@ -1,8 +1,8 @@
-package com.jpsoft.epay.modules.communication.server.handler;
+package com.jpsoft.smart.modules.communication.server.handler;
 
-import com.jpsoft.epay.modules.communication.server.AttributeKeys;
-import com.jpsoft.epay.modules.communication.server.ChannelWrapper;
-import com.jpsoft.epay.modules.communication.server.protocol.MeterReceivePacket;
+import com.jpsoft.smart.modules.communication.server.AttributeKeys;
+import com.jpsoft.smart.modules.communication.server.ChannelWrapper;
+import com.jpsoft.smart.modules.communication.server.protocol.MeterReceivePacket;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;

src/main/java/com/jpsoft/epay/modules/communication/server/protocol/HeartbeatReceivePacket.java → src/main/java/com/jpsoft/smart/modules/communication/server/protocol/HeartbeatReceivePacket.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.communication.server.protocol;
+package com.jpsoft.smart.modules.communication.server.protocol;
 
 import lombok.Data;
 import lombok.ToString;

src/main/java/com/jpsoft/epay/modules/communication/server/protocol/MeterReceivePacket.java → src/main/java/com/jpsoft/smart/modules/communication/server/protocol/MeterReceivePacket.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.communication.server.protocol;
+package com.jpsoft.smart.modules.communication.server.protocol;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

src/main/java/com/jpsoft/epay/modules/communication/server/protocol/MeterSendPacket.java → src/main/java/com/jpsoft/smart/modules/communication/server/protocol/MeterSendPacket.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.communication.server.protocol;
+package com.jpsoft.smart.modules.communication.server.protocol;
 
 import lombok.Data;
 import lombok.ToString;

src/main/java/com/jpsoft/epay/modules/pay/alipay/AlipayController.java → src/main/java/com/jpsoft/smart/modules/pay/alipay/AlipayController.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.pay.alipay;
+package com.jpsoft.smart.modules.pay.alipay;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -9,12 +9,12 @@ import com.alipay.api.internal.util.AlipaySignature;
 import com.alipay.api.request.AlipayTradePrecreateRequest;
 import com.alipay.api.response.AlipayTradePrecreateResponse;
 import com.ijpay.alipay.AliPayApi;
-import com.jpsoft.epay.modules.base.entity.RechargeRecord;
-import com.jpsoft.epay.modules.base.service.RechargeRecordService;
-import com.jpsoft.epay.modules.business.service.RechargeService;
-import com.jpsoft.epay.modules.common.dto.MessageResult;
-import com.jpsoft.epay.modules.communication.server.protocol.MeterReceivePacket;
-import com.jpsoft.epay.modules.pay.properties.AliPayProperties;
+import com.jpsoft.smart.modules.base.entity.RechargeRecord;
+import com.jpsoft.smart.modules.base.service.RechargeRecordService;
+import com.jpsoft.smart.modules.business.service.RechargeService;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.communication.server.protocol.MeterReceivePacket;
+import com.jpsoft.smart.modules.pay.properties.AliPayProperties;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
@@ -22,7 +22,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.print.DocFlavor;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.Date;

src/main/java/com/jpsoft/epay/modules/pay/properties/AliPayProperties.java → src/main/java/com/jpsoft/smart/modules/pay/properties/AliPayProperties.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.pay.properties;
+package com.jpsoft.smart.modules.pay.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

src/main/java/com/jpsoft/epay/modules/pay/properties/WxPayProperties.java → src/main/java/com/jpsoft/smart/modules/pay/properties/WxPayProperties.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.pay.properties;
+package com.jpsoft.smart.modules.pay.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

src/main/java/com/jpsoft/epay/modules/pay/weixin/WxPayController.java → src/main/java/com/jpsoft/smart/modules/pay/weixin/WxPayController.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.pay.weixin;
+package com.jpsoft.smart.modules.pay.weixin;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
@@ -9,14 +9,12 @@ import com.ijpay.core.kit.WxPayKit;
 import com.ijpay.wxpay.WxPayApi;
 import com.ijpay.wxpay.WxPayApiConfigKit;
 import com.ijpay.wxpay.model.UnifiedOrderModel;
-import com.jpsoft.epay.modules.base.entity.RechargeRecord;
-import com.jpsoft.epay.modules.base.service.ElectricMeterInfoService;
-import com.jpsoft.epay.modules.base.service.RechargeRecordService;
-import com.jpsoft.epay.modules.business.controller.DemoController;
-import com.jpsoft.epay.modules.business.service.RechargeService;
-import com.jpsoft.epay.modules.common.dto.MessageResult;
-import com.jpsoft.epay.modules.communication.server.protocol.MeterReceivePacket;
-import com.jpsoft.epay.modules.pay.properties.WxPayProperties;
+import com.jpsoft.smart.modules.base.entity.RechargeRecord;
+import com.jpsoft.smart.modules.base.service.RechargeRecordService;
+import com.jpsoft.smart.modules.business.service.RechargeService;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.communication.server.protocol.MeterReceivePacket;
+import com.jpsoft.smart.modules.pay.properties.WxPayProperties;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -53,7 +51,7 @@ public class WxPayController {
 
     @ApiOperation(value = "微信JSAPI支付")
     @GetMapping("/webPay")
-    public MessageResult webPay(String recordId,String openId) {
+    public MessageResult webPay(String recordId, String openId) {
         MessageResult msgResult = new MessageResult<>();
         try {
             RechargeRecord rechargeRecord = rechargeRecordService.get(recordId);

src/main/java/com/jpsoft/epay/modules/sys/controller/ApiController.java → src/main/java/com/jpsoft/smart/modules/sys/controller/ApiController.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.sys.controller;
+package com.jpsoft.smart.modules.sys.controller;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.ResponseEntity;

src/main/java/com/jpsoft/epay/modules/sys/controller/DataDictionaryController.java → src/main/java/com/jpsoft/smart/modules/sys/controller/DataDictionaryController.java

@@ -1,11 +1,11 @@
-package com.jpsoft.epay.modules.sys.controller;
+package com.jpsoft.smart.modules.sys.controller;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.common.dto.MessageResult;
-import com.jpsoft.epay.modules.common.dto.Sort;
-import com.jpsoft.epay.modules.common.utils.PojoUtils;
-import com.jpsoft.epay.modules.sys.entity.DataDictionary;
-import com.jpsoft.epay.modules.sys.service.DataDictionaryService;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.utils.PojoUtils;
+import com.jpsoft.smart.modules.sys.entity.DataDictionary;
+import com.jpsoft.smart.modules.sys.service.DataDictionaryService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

src/main/java/com/jpsoft/epay/modules/sys/controller/MenuController.java → src/main/java/com/jpsoft/smart/modules/sys/controller/MenuController.java

@@ -1,11 +1,11 @@
-package com.jpsoft.epay.modules.sys.controller;
+package com.jpsoft.smart.modules.sys.controller;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.common.utils.PojoUtils;
-import com.jpsoft.epay.modules.common.dto.Sort;
-import com.jpsoft.epay.modules.common.dto.MessageResult;
-import com.jpsoft.epay.modules.sys.entity.Menu;
-import com.jpsoft.epay.modules.sys.service.MenuService;
+import com.jpsoft.smart.modules.common.utils.PojoUtils;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.sys.entity.Menu;
+import com.jpsoft.smart.modules.sys.service.MenuService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

src/main/java/com/jpsoft/epay/modules/sys/controller/PermissionController.java → src/main/java/com/jpsoft/smart/modules/sys/controller/PermissionController.java

@@ -1,11 +1,11 @@
-package com.jpsoft.epay.modules.sys.controller;
+package com.jpsoft.smart.modules.sys.controller;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.common.utils.PojoUtils;
-import com.jpsoft.epay.modules.common.dto.Sort;
-import com.jpsoft.epay.modules.common.dto.MessageResult;
-import com.jpsoft.epay.modules.sys.entity.Permission;
-import com.jpsoft.epay.modules.sys.service.PermissionService;
+import com.jpsoft.smart.modules.common.utils.PojoUtils;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.sys.entity.Permission;
+import com.jpsoft.smart.modules.sys.service.PermissionService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

src/main/java/com/jpsoft/epay/modules/sys/controller/RoleController.java → src/main/java/com/jpsoft/smart/modules/sys/controller/RoleController.java

@@ -1,16 +1,16 @@
-package com.jpsoft.epay.modules.sys.controller;
+package com.jpsoft.smart.modules.sys.controller;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.common.utils.PojoUtils;
-import com.jpsoft.epay.modules.common.dto.Sort;
-import com.jpsoft.epay.modules.common.dto.MessageResult;
-import com.jpsoft.epay.modules.sys.dto.RoleRelatedDTO;
-import com.jpsoft.epay.modules.sys.entity.Role;
-import com.jpsoft.epay.modules.sys.entity.RoleMenu;
-import com.jpsoft.epay.modules.sys.entity.RolePermission;
-import com.jpsoft.epay.modules.sys.service.RoleMenuService;
-import com.jpsoft.epay.modules.sys.service.RolePermissionService;
-import com.jpsoft.epay.modules.sys.service.RoleService;
+import com.jpsoft.smart.modules.common.utils.PojoUtils;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.sys.dto.RoleRelatedDTO;
+import com.jpsoft.smart.modules.sys.entity.Role;
+import com.jpsoft.smart.modules.sys.entity.RoleMenu;
+import com.jpsoft.smart.modules.sys.entity.RolePermission;
+import com.jpsoft.smart.modules.sys.service.RoleMenuService;
+import com.jpsoft.smart.modules.sys.service.RolePermissionService;
+import com.jpsoft.smart.modules.sys.service.RoleService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

src/main/java/com/jpsoft/epay/modules/sys/controller/UserController.java → src/main/java/com/jpsoft/smart/modules/sys/controller/UserController.java

@@ -1,15 +1,15 @@
-package com.jpsoft.epay.modules.sys.controller;
+package com.jpsoft.smart.modules.sys.controller;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.common.dto.Sort;
-import com.jpsoft.epay.modules.common.utils.DES3;
-import com.jpsoft.epay.modules.common.utils.PojoUtils;
-import com.jpsoft.epay.modules.common.dto.MessageResult;
-import com.jpsoft.epay.modules.sys.entity.Role;
-import com.jpsoft.epay.modules.sys.entity.User;
-import com.jpsoft.epay.modules.sys.entity.UserRole;
-import com.jpsoft.epay.modules.sys.service.UserRoleService;
-import com.jpsoft.epay.modules.sys.service.UserService;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.utils.DES3;
+import com.jpsoft.smart.modules.common.utils.PojoUtils;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.sys.entity.Role;
+import com.jpsoft.smart.modules.sys.entity.User;
+import com.jpsoft.smart.modules.sys.entity.UserRole;
+import com.jpsoft.smart.modules.sys.service.UserRoleService;
+import com.jpsoft.smart.modules.sys.service.UserService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

src/main/java/com/jpsoft/epay/modules/sys/dao/DataDictionaryDAO.java → src/main/java/com/jpsoft/smart/modules/sys/dao/DataDictionaryDAO.java

@@ -1,7 +1,7 @@
-package com.jpsoft.epay.modules.sys.dao;
+package com.jpsoft.smart.modules.sys.dao;
 
-import com.jpsoft.epay.modules.common.dto.Sort;
-import com.jpsoft.epay.modules.sys.entity.DataDictionary;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.sys.entity.DataDictionary;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

src/main/java/com/jpsoft/epay/modules/sys/dao/MenuDAO.java → src/main/java/com/jpsoft/smart/modules/sys/dao/MenuDAO.java

@@ -1,12 +1,12 @@
-package com.jpsoft.epay.modules.sys.dao;
+package com.jpsoft.smart.modules.sys.dao;
 
 import java.util.List;
 
+import com.jpsoft.smart.modules.common.dto.Sort;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.epay.modules.sys.entity.Menu;
+import com.jpsoft.smart.modules.sys.entity.Menu;
 import java.util.Map;
-import com.jpsoft.epay.modules.common.dto.Sort;
 
 @Repository
 public interface MenuDAO {

src/main/java/com/jpsoft/epay/modules/sys/dao/PermissionDAO.java → src/main/java/com/jpsoft/smart/modules/sys/dao/PermissionDAO.java

@@ -1,12 +1,12 @@
-package com.jpsoft.epay.modules.sys.dao;
+package com.jpsoft.smart.modules.sys.dao;
 
 import java.util.List;
 
+import com.jpsoft.smart.modules.common.dto.Sort;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.epay.modules.sys.entity.Permission;
+import com.jpsoft.smart.modules.sys.entity.Permission;
 import java.util.Map;
-import com.jpsoft.epay.modules.common.dto.Sort;
 
 @Repository
 public interface PermissionDAO {

src/main/java/com/jpsoft/epay/modules/sys/dao/RoleDAO.java → src/main/java/com/jpsoft/smart/modules/sys/dao/RoleDAO.java

@@ -1,10 +1,11 @@
-package com.jpsoft.epay.modules.sys.dao;
+package com.jpsoft.smart.modules.sys.dao;
 
 import java.util.List;
+
+import com.jpsoft.smart.modules.common.dto.Sort;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.epay.modules.sys.entity.Role;
+import com.jpsoft.smart.modules.sys.entity.Role;
 import java.util.Map;
-import com.jpsoft.epay.modules.common.dto.Sort;
 
 @Repository
 public interface RoleDAO {

src/main/java/com/jpsoft/epay/modules/sys/dao/RoleMenuDAO.java → src/main/java/com/jpsoft/smart/modules/sys/dao/RoleMenuDAO.java

@@ -1,10 +1,11 @@
-package com.jpsoft.epay.modules.sys.dao;
+package com.jpsoft.smart.modules.sys.dao;
 
 import java.util.List;
+
+import com.jpsoft.smart.modules.common.dto.Sort;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.epay.modules.sys.entity.RoleMenu;
+import com.jpsoft.smart.modules.sys.entity.RoleMenu;
 import java.util.Map;
-import com.jpsoft.epay.modules.common.dto.Sort;
 
 @Repository
 public interface RoleMenuDAO {

src/main/java/com/jpsoft/epay/modules/sys/dao/RolePermissionDAO.java → src/main/java/com/jpsoft/smart/modules/sys/dao/RolePermissionDAO.java

@@ -1,10 +1,11 @@
-package com.jpsoft.epay.modules.sys.dao;
+package com.jpsoft.smart.modules.sys.dao;
 
 import java.util.List;
+
+import com.jpsoft.smart.modules.common.dto.Sort;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.epay.modules.sys.entity.RolePermission;
+import com.jpsoft.smart.modules.sys.entity.RolePermission;
 import java.util.Map;
-import com.jpsoft.epay.modules.common.dto.Sort;
 
 @Repository
 public interface RolePermissionDAO {

src/main/java/com/jpsoft/epay/modules/sys/dao/UserDAO.java → src/main/java/com/jpsoft/smart/modules/sys/dao/UserDAO.java

@@ -1,12 +1,12 @@
-package com.jpsoft.epay.modules.sys.dao;
+package com.jpsoft.smart.modules.sys.dao;
 
 import java.util.List;
 
+import com.jpsoft.smart.modules.common.dto.Sort;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.epay.modules.sys.entity.User;
+import com.jpsoft.smart.modules.sys.entity.User;
 import java.util.Map;
-import com.jpsoft.epay.modules.common.dto.Sort;
 
 @Repository
 public interface UserDAO {

src/main/java/com/jpsoft/epay/modules/sys/dao/UserRoleDAO.java → src/main/java/com/jpsoft/smart/modules/sys/dao/UserRoleDAO.java

@@ -1,12 +1,13 @@
-package com.jpsoft.epay.modules.sys.dao;
+package com.jpsoft.smart.modules.sys.dao;
 
 import java.util.List;
 
-import com.jpsoft.epay.modules.sys.entity.Role;
+import com.jpsoft.smart.modules.sys.entity.Role;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.sys.entity.UserRole;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.epay.modules.sys.entity.UserRole;
+
 import java.util.Map;
-import com.jpsoft.epay.modules.common.dto.Sort;
 
 @Repository
 public interface UserRoleDAO {

src/main/java/com/jpsoft/epay/modules/sys/dto/RoleRelatedDTO.java → src/main/java/com/jpsoft/smart/modules/sys/dto/RoleRelatedDTO.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.sys.dto;
+package com.jpsoft.smart.modules.sys.dto;
 
 import java.util.List;
 

src/main/java/com/jpsoft/epay/modules/sys/entity/DataDictionary.java → src/main/java/com/jpsoft/smart/modules/sys/entity/DataDictionary.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.sys.entity;
+package com.jpsoft.smart.modules.sys.entity;
 
 import java.util.Date;
 

src/main/java/com/jpsoft/epay/modules/sys/entity/Menu.java → src/main/java/com/jpsoft/smart/modules/sys/entity/Menu.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.sys.entity;
+package com.jpsoft.smart.modules.sys.entity;
 
 import java.util.Date;
 import java.util.List;

src/main/java/com/jpsoft/epay/modules/sys/entity/Permission.java → src/main/java/com/jpsoft/smart/modules/sys/entity/Permission.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.sys.entity;
+package com.jpsoft.smart.modules.sys.entity;
 
 import java.util.Date;
 import org.springframework.format.annotation.DateTimeFormat;

src/main/java/com/jpsoft/epay/modules/sys/entity/Role.java → src/main/java/com/jpsoft/smart/modules/sys/entity/Role.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.sys.entity;
+package com.jpsoft.smart.modules.sys.entity;
 
 import java.util.Date;
 

src/main/java/com/jpsoft/epay/modules/sys/entity/RoleMenu.java → src/main/java/com/jpsoft/smart/modules/sys/entity/RoleMenu.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.sys.entity;
+package com.jpsoft.smart.modules.sys.entity;
 
 import java.util.Date;
 

src/main/java/com/jpsoft/epay/modules/sys/entity/RolePermission.java → src/main/java/com/jpsoft/smart/modules/sys/entity/RolePermission.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.sys.entity;
+package com.jpsoft.smart.modules.sys.entity;
 
 import java.util.Date;
 

src/main/java/com/jpsoft/epay/modules/sys/entity/User.java → src/main/java/com/jpsoft/smart/modules/sys/entity/User.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.sys.entity;
+package com.jpsoft.smart.modules.sys.entity;
 
 import java.util.Date;
 import java.util.List;

src/main/java/com/jpsoft/epay/modules/sys/entity/UserRole.java → src/main/java/com/jpsoft/smart/modules/sys/entity/UserRole.java

@@ -1,4 +1,4 @@
-package com.jpsoft.epay.modules.sys.entity;
+package com.jpsoft.smart.modules.sys.entity;
 
 import java.util.Date;
 

src/main/java/com/jpsoft/epay/modules/sys/service/DataDictionaryService.java → src/main/java/com/jpsoft/smart/modules/sys/service/DataDictionaryService.java

@@ -1,8 +1,8 @@
-package com.jpsoft.epay.modules.sys.service;
+package com.jpsoft.smart.modules.sys.service;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.common.dto.Sort;
-import com.jpsoft.epay.modules.sys.entity.DataDictionary;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.sys.entity.DataDictionary;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/jpsoft/epay/modules/sys/service/MenuService.java → src/main/java/com/jpsoft/smart/modules/sys/service/MenuService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.epay.modules.sys.service;
+package com.jpsoft.smart.modules.sys.service;
 
 import java.util.List;
 import java.util.Map;
-import com.jpsoft.epay.modules.sys.entity.Menu;
+import com.jpsoft.smart.modules.sys.entity.Menu;
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.dto.Sort;
 
 public interface MenuService {
 	Menu get(String id);

src/main/java/com/jpsoft/epay/modules/sys/service/PermissionService.java → src/main/java/com/jpsoft/smart/modules/sys/service/PermissionService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.epay.modules.sys.service;
+package com.jpsoft.smart.modules.sys.service;
 
 import java.util.List;
 import java.util.Map;
-import com.jpsoft.epay.modules.sys.entity.Permission;
+import com.jpsoft.smart.modules.sys.entity.Permission;
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.dto.Sort;
 
 public interface PermissionService {
 	Permission get(String id);

src/main/java/com/jpsoft/epay/modules/sys/service/RoleMenuService.java → src/main/java/com/jpsoft/smart/modules/sys/service/RoleMenuService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.epay.modules.sys.service;
+package com.jpsoft.smart.modules.sys.service;
 
 import java.util.List;
 import java.util.Map;
-import com.jpsoft.epay.modules.sys.entity.RoleMenu;
+import com.jpsoft.smart.modules.sys.entity.RoleMenu;
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.dto.Sort;
 
 public interface RoleMenuService {
 	RoleMenu get(String id);

src/main/java/com/jpsoft/epay/modules/sys/service/RolePermissionService.java → src/main/java/com/jpsoft/smart/modules/sys/service/RolePermissionService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.epay.modules.sys.service;
+package com.jpsoft.smart.modules.sys.service;
 
 import java.util.List;
 import java.util.Map;
-import com.jpsoft.epay.modules.sys.entity.RolePermission;
+import com.jpsoft.smart.modules.sys.entity.RolePermission;
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.dto.Sort;
 
 public interface RolePermissionService {
 	RolePermission get(String id);

src/main/java/com/jpsoft/epay/modules/sys/service/RoleService.java → src/main/java/com/jpsoft/smart/modules/sys/service/RoleService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.epay.modules.sys.service;
+package com.jpsoft.smart.modules.sys.service;
 
 import java.util.List;
 import java.util.Map;
-import com.jpsoft.epay.modules.sys.entity.Role;
+import com.jpsoft.smart.modules.sys.entity.Role;
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.dto.Sort;
 
 public interface RoleService {
 	Role get(String id);

src/main/java/com/jpsoft/epay/modules/sys/service/UserRoleService.java → src/main/java/com/jpsoft/smart/modules/sys/service/UserRoleService.java

@@ -1,12 +1,12 @@
-package com.jpsoft.epay.modules.sys.service;
+package com.jpsoft.smart.modules.sys.service;
 
 import java.util.List;
 import java.util.Map;
 
-import com.jpsoft.epay.modules.sys.entity.Role;
-import com.jpsoft.epay.modules.sys.entity.UserRole;
+import com.jpsoft.smart.modules.sys.entity.Role;
+import com.jpsoft.smart.modules.sys.entity.UserRole;
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.dto.Sort;
 
 public interface UserRoleService {
 	UserRole get(String id);

src/main/java/com/jpsoft/epay/modules/sys/service/UserService.java → src/main/java/com/jpsoft/smart/modules/sys/service/UserService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.epay.modules.sys.service;
+package com.jpsoft.smart.modules.sys.service;
 
 import java.util.List;
 import java.util.Map;
-import com.jpsoft.epay.modules.sys.entity.User;
+import com.jpsoft.smart.modules.sys.entity.User;
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.dto.Sort;
 
 public interface UserService {
 	User get(String id);

src/main/java/com/jpsoft/epay/modules/sys/service/impl/DataDictionaryServiceImpl.java → src/main/java/com/jpsoft/smart/modules/sys/service/impl/DataDictionaryServiceImpl.java

@@ -1,11 +1,11 @@
-package com.jpsoft.epay.modules.sys.service.impl;
+package com.jpsoft.smart.modules.sys.service.impl;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import com.jpsoft.epay.modules.common.dto.Sort;
-import com.jpsoft.epay.modules.sys.dao.DataDictionaryDAO;
-import com.jpsoft.epay.modules.sys.entity.DataDictionary;
-import com.jpsoft.epay.modules.sys.service.DataDictionaryService;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.sys.dao.DataDictionaryDAO;
+import com.jpsoft.smart.modules.sys.entity.DataDictionary;
+import com.jpsoft.smart.modules.sys.service.DataDictionaryService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/com/jpsoft/epay/modules/sys/service/impl/MenuServiceImpl.java → src/main/java/com/jpsoft/smart/modules/sys/service/impl/MenuServiceImpl.java

@@ -1,15 +1,16 @@
-package com.jpsoft.epay.modules.sys.service.impl;
+package com.jpsoft.smart.modules.sys.service.impl;
 
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
+
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.sys.dao.MenuDAO;
+import com.jpsoft.smart.modules.sys.entity.Menu;
+import com.jpsoft.smart.modules.sys.service.MenuService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.epay.modules.sys.dao.MenuDAO;
-import com.jpsoft.epay.modules.sys.entity.Menu;
-import com.jpsoft.epay.modules.sys.service.MenuService;
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

src/main/java/com/jpsoft/epay/modules/sys/service/impl/PermissionServiceImpl.java → src/main/java/com/jpsoft/smart/modules/sys/service/impl/PermissionServiceImpl.java

@@ -1,15 +1,16 @@
-package com.jpsoft.epay.modules.sys.service.impl;
+package com.jpsoft.smart.modules.sys.service.impl;
 
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
+
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.sys.dao.PermissionDAO;
+import com.jpsoft.smart.modules.sys.entity.Permission;
+import com.jpsoft.smart.modules.sys.service.PermissionService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.epay.modules.sys.dao.PermissionDAO;
-import com.jpsoft.epay.modules.sys.entity.Permission;
-import com.jpsoft.epay.modules.sys.service.PermissionService;
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

src/main/java/com/jpsoft/epay/modules/sys/service/impl/RoleMenuServiceImpl.java → src/main/java/com/jpsoft/smart/modules/sys/service/impl/RoleMenuServiceImpl.java

@@ -1,15 +1,16 @@
-package com.jpsoft.epay.modules.sys.service.impl;
+package com.jpsoft.smart.modules.sys.service.impl;
 
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
+
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.sys.dao.RoleMenuDAO;
+import com.jpsoft.smart.modules.sys.entity.RoleMenu;
+import com.jpsoft.smart.modules.sys.service.RoleMenuService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.epay.modules.sys.dao.RoleMenuDAO;
-import com.jpsoft.epay.modules.sys.entity.RoleMenu;
-import com.jpsoft.epay.modules.sys.service.RoleMenuService;
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

src/main/java/com/jpsoft/epay/modules/sys/service/impl/RolePermissionServiceImpl.java → src/main/java/com/jpsoft/smart/modules/sys/service/impl/RolePermissionServiceImpl.java

@@ -1,15 +1,16 @@
-package com.jpsoft.epay.modules.sys.service.impl;
+package com.jpsoft.smart.modules.sys.service.impl;
 
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
+
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.sys.dao.RolePermissionDAO;
+import com.jpsoft.smart.modules.sys.entity.RolePermission;
+import com.jpsoft.smart.modules.sys.service.RolePermissionService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.epay.modules.sys.dao.RolePermissionDAO;
-import com.jpsoft.epay.modules.sys.entity.RolePermission;
-import com.jpsoft.epay.modules.sys.service.RolePermissionService;
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

src/main/java/com/jpsoft/epay/modules/sys/service/impl/RoleServiceImpl.java → src/main/java/com/jpsoft/smart/modules/sys/service/impl/RoleServiceImpl.java

@@ -1,15 +1,16 @@
-package com.jpsoft.epay.modules.sys.service.impl;
+package com.jpsoft.smart.modules.sys.service.impl;
 
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
+
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.sys.dao.RoleDAO;
+import com.jpsoft.smart.modules.sys.entity.Role;
+import com.jpsoft.smart.modules.sys.service.RoleService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.epay.modules.sys.dao.RoleDAO;
-import com.jpsoft.epay.modules.sys.entity.Role;
-import com.jpsoft.epay.modules.sys.service.RoleService;
 import com.github.pagehelper.Page;
-import com.jpsoft.epay.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional