Skip to content

M
manager
Commit 6c65e984 by kangxiaoshan
Options

manaer 测试分支

parent 2971c585
Showing with 66 additions and 48 deletions
.gitignore
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
/.classpath /.classpath
/.project /.project
/.externalToolBuilders /.externalToolBuilders
/.idea/ .idea/
/node_modules/ /node_modules/
/dist/ /dist/
!/src/main/webapp/WEB-INF !/src/main/webapp/WEB-INF
......
.idea/workspace.xml
This source diff could not be displayed because it is too large. You can view the blob instead.
manage.iml
...@@ -11,8 +11,11 @@ ...@@ -11,8 +11,11 @@
</webroots> </webroots>
</configuration> </configuration>
</facet> </facet>
<facet type="Spring" name="Spring">
<configuration />
</facet>
</component> </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" /> <output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
...@@ -79,7 +82,7 @@ ...@@ -79,7 +82,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Maven: com.alibaba:jconsole:1.8.0"> <library name="Maven: com.alibaba:jconsole:1.8.0">
<CLASSES> <CLASSES>
<root url="jar://E:/Java/jdk1.8.0_65/lib/jconsole.jar!/" /> <root url="jar://D:/Program Files/Java/jdk1.8.0_181/lib/jconsole.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
...@@ -88,7 +91,7 @@ ...@@ -88,7 +91,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Maven: com.alibaba:tools:1.8.0"> <library name="Maven: com.alibaba:tools:1.8.0">
<CLASSES> <CLASSES>
<root url="jar://E:/Java/jdk1.8.0_65/lib/tools.jar!/" /> <root url="jar://D:/Program Files/Java/jdk1.8.0_181/lib/tools.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
......
pom.xml
...@@ -37,7 +37,8 @@ ...@@ -37,7 +37,8 @@
<!--数据源配置--> <!--数据源配置-->
<datasource.driver>com.mysql.jdbc.Driver</datasource.driver> <datasource.driver>com.mysql.jdbc.Driver</datasource.driver>
<!--//office--> <!--//office-->
<default.datasource.url>jdbc:mysql://192.168.2.57:3306/manager?characterEncoding=utf-8</default.datasource.url> <default.datasource.url>jdbc:mysql://192.168.2.57:3306/manager?characterEncoding=utf-8
</default.datasource.url>
<default.datasource.username>root</default.datasource.username> <default.datasource.username>root</default.datasource.username>
<default.datasource.password>reyun123</default.datasource.password> <default.datasource.password>reyun123</default.datasource.password>
...@@ -93,7 +94,8 @@ ...@@ -93,7 +94,8 @@
<!--数据源配置--> <!--数据源配置-->
<datasource.driver>com.mysql.jdbc.Driver</datasource.driver> <datasource.driver>com.mysql.jdbc.Driver</datasource.driver>
<!--//office--> <!--//office-->
<default.datasource.url>jdbc:mysql://10.3.20.32:3306/manager?characterEncoding=utf-8</default.datasource.url> <default.datasource.url>jdbc:mysql://10.3.20.32:3306/manager?characterEncoding=utf-8
</default.datasource.url>
<default.datasource.username>root</default.datasource.username> <default.datasource.username>root</default.datasource.username>
<default.datasource.password>reyun.123</default.datasource.password> <default.datasource.password>reyun.123</default.datasource.password>
...@@ -125,7 +127,8 @@ ...@@ -125,7 +127,8 @@
<!-- 单位是分钟--> <!-- 单位是分钟-->
<mail.valid_time>3</mail.valid_time> <mail.valid_time>3</mail.valid_time>
<report.url>http://localhost:9010</report.url> <!--<report.url>http://localhost:9010</report.url>-->
<report.url>http://http://10.3.20.41:11010</report.url>
<!--Redis setting--> <!--Redis setting-->
<redis.key.validtime>120</redis.key.validtime> <redis.key.validtime>120</redis.key.validtime>
<redis.ip.requesttimes>5</redis.ip.requesttimes> <redis.ip.requesttimes>5</redis.ip.requesttimes>
...@@ -145,7 +148,9 @@ ...@@ -145,7 +148,9 @@
<id>preview</id> <id>preview</id>
<properties> <properties>
<label>dev</label> <label>dev</label>
<datasource.url>jdbc:mysql://reyuntest.c42s8pkbxrdg.rds.cn-north-1.amazonaws.com.cn:3306/trackingio_test?characterEncoding=utf-8</datasource.url> <datasource.url>
jdbc:mysql://reyuntest.c42s8pkbxrdg.rds.cn-north-1.amazonaws.com.cn:3306/trackingio_test?characterEncoding=utf-8
</datasource.url>
<datasource.username>reyuntest</datasource.username> <datasource.username>reyuntest</datasource.username>
<datasource.password>reyuntest</datasource.password> <datasource.password>reyuntest</datasource.password>
<datasource.driver>com.mysql.jdbc.Driver</datasource.driver> <datasource.driver>com.mysql.jdbc.Driver</datasource.driver>
...@@ -162,27 +167,39 @@ ...@@ -162,27 +167,39 @@
<!--数据源配置--> <!--数据源配置-->
<datasource.driver>com.mysql.jdbc.Driver</datasource.driver> <datasource.driver>com.mysql.jdbc.Driver</datasource.driver>
<!--//office--> <!--//office-->
<default.datasource.url>jdbc:mysql://tkio.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/manager?characterEncoding=utf-8</default.datasource.url> <default.datasource.url>
jdbc:mysql://tkio.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/manager?characterEncoding=utf-8
</default.datasource.url>
<default.datasource.username>trackingio</default.datasource.username> <default.datasource.username>trackingio</default.datasource.username>
<default.datasource.password>trackingio</default.datasource.password> <default.datasource.password>trackingio</default.datasource.password>
<office.url>jdbc:mysql://track.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/office?characterEncoding=utf-8</office.url> <office.url>
jdbc:mysql://track.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/office?characterEncoding=utf-8
</office.url>
<office.username>office</office.username> <office.username>office</office.username>
<office.password>office</office.password> <office.password>office</office.password>
<tkio.url>jdbc:mysql://tkio.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/trackingio?characterEncoding=utf-8</tkio.url> <tkio.url>
jdbc:mysql://tkio.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/trackingio?characterEncoding=utf-8
</tkio.url>
<tkio.username>trackingio</tkio.username> <tkio.username>trackingio</tkio.username>
<tkio.password>trackingio</tkio.password> <tkio.password>trackingio</tkio.password>
<track.url>jdbc:mysql://track.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/track?characterEncoding=utf-8</track.url> <track.url>
jdbc:mysql://track.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/track?characterEncoding=utf-8
</track.url>
<track.username>admin</track.username> <track.username>admin</track.username>
<track.password>admin!@#456</track.password> <track.password>admin!@#456</track.password>
<dmp.url>jdbc:mysql://tkio.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/manager?characterEncoding=utf-8</dmp.url> <dmp.url>
jdbc:mysql://tkio.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/manager?characterEncoding=utf-8
</dmp.url>
<dmp.username>trackingio</dmp.username> <dmp.username>trackingio</dmp.username>
<dmp.password>trackingio</dmp.password> <dmp.password>trackingio</dmp.password>
<io.url>jdbc:mysql://tkio.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/userio?characterEncoding=utf-8</io.url> <io.url>
jdbc:mysql://tkio.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/userio?characterEncoding=utf-8
</io.url>
<io.username>reyun</io.username> <io.username>reyun</io.username>
<io.password>Reyun123</io.password> <io.password>Reyun123</io.password>
......
src/main/java/common/controller/LoginController.java
...@@ -113,4 +113,7 @@ public class LoginController { ...@@ -113,4 +113,7 @@ public class LoginController {
return ResultModel.OK(true); return ResultModel.OK(true);
} }
} }
src/main/java/common/service/impl/UserServiceImpl.java
...@@ -353,5 +353,10 @@ public class UserServiceImpl implements UserService { ...@@ -353,5 +353,10 @@ public class UserServiceImpl implements UserService {
return result; return result;
} }
public static void main(String[] args) {
System.out.println(CipherUtil.generatePassword("111111"));
}
} }
src/main/java/track/service/impl/TrackAccountFlowRestrictServiceImpl.java
package track.service.impl; package track.service.impl;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import tkio.model.AccountRestrict4Web;
import track.model.Account; import track.model.Account;
import track.model.App; import track.model.App;
import track.repository.MeasureRepository; import track.repository.MeasureRepository;
import track.repository.TrackAppRepository; import track.repository.TrackAppRepository;
import track.service.TrackAccountFlowRestrictService; import track.service.TrackAccountFlowRestrictService;
import util.Constant;
import util.DateUtil; import util.DateUtil;
import util.HttpClientUtil;
import util.ValidateUtil; import util.ValidateUtil;
import java.math.BigDecimal;
import java.math.BigInteger; import java.math.BigInteger;
import java.text.DecimalFormat; import java.util.ArrayList;
import java.text.SimpleDateFormat; import java.util.List;
import java.util.*;
/** /**
* Created by song on 2017/10/19. * Created by song on 2017/10/19.
......
src/main/resources/spring/applicationContext.xml
...@@ -16,29 +16,30 @@ ...@@ -16,29 +16,30 @@
<description>Spring公共配置</description> <description>Spring公共配置</description>
<aop:aspectj-autoproxy proxy-target-class="true"/> <aop:aspectj-autoproxy proxy-target-class="true"/>
<context:component-scan base-package="tkio" /> <context:component-scan base-package="tkio"/>
<context:component-scan base-package="track" /> <context:component-scan base-package="track"/>
<context:component-scan base-package="userio" /> <context:component-scan base-package="userio"/>
<context:component-scan base-package="common" /> <context:component-scan base-package="common"/>
<context:component-scan base-package="office" /> <context:component-scan base-package="office"/>
<context:component-scan base-package="dmp" /> <context:component-scan base-package="dmp"/>
<context:component-scan base-package="security" /> <context:component-scan base-package="security"/>
<context:component-scan base-package="adi" /> <context:component-scan base-package="adi"/>
<context:property-placeholder location="classpath:persistence.properties,classpath:redis.properties"/> <context:property-placeholder location="classpath:persistence.properties,classpath:redis.properties"/>
<!--Redis配置--> <!--Redis配置-->
<bean id="poolConfig" class="redis.clients.jedis.JedisPoolConfig"> <bean id="poolConfig" class="redis.clients.jedis.JedisPoolConfig">
<property name="maxIdle" value="300" /> <property name="maxIdle" value="300"/>
<property name="maxTotal" value="600" /> <property name="maxTotal" value="600"/>
<property name="maxWaitMillis" value="1000"></property> <property name="maxWaitMillis" value="1000"></property>
<property name="testOnBorrow" value="true" /> <property name="testOnBorrow" value="true"/>
</bean> </bean>
<bean id="connectionFactory" class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory" p:hostName="${redis.Surl.host}" p:port="${redis.Surl.port}" p:poolConfig-ref="poolConfig"/> <bean id="connectionFactory" class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory"
p:hostName="${redis.Surl.host}" p:port="${redis.Surl.port}" p:poolConfig-ref="poolConfig"/>
<bean id="redisTemplate" class="org.springframework.data.redis.core.StringRedisTemplate"> <bean id="redisTemplate" class="org.springframework.data.redis.core.StringRedisTemplate">
<property name="connectionFactory" ref="connectionFactory" /> <property name="connectionFactory" ref="connectionFactory"/>
</bean> </bean>
<!--//Redis配置 --> <!--//Redis配置 -->
...@@ -93,7 +94,7 @@ ...@@ -93,7 +94,7 @@
<property name="dataSource" ref="dataSource"/> <property name="dataSource" ref="dataSource"/>
<property name="packagesToScan" value="common.model"> <property name="packagesToScan" value="common.model">
</property> </property>
<property name="persistenceUnitName" value="defaultUnit" /> <property name="persistenceUnitName" value="defaultUnit"/>
<property name="jpaVendorAdapter" ref="hibernateJpaVendorAdapter"/> <property name="jpaVendorAdapter" ref="hibernateJpaVendorAdapter"/>
<property name="jpaProperties"> <property name="jpaProperties">
...@@ -111,7 +112,7 @@ ...@@ -111,7 +112,7 @@
<bean id="officeEntityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"> <bean id="officeEntityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="dataSource" ref="officeDataSource"/> <property name="dataSource" ref="officeDataSource"/>
<property name="packagesToScan" value="office.model"></property> <property name="packagesToScan" value="office.model"></property>
<property name="persistenceUnitName" value="officeUnit" /> <property name="persistenceUnitName" value="officeUnit"/>
<property name="jpaVendorAdapter" ref="hibernateJpaVendorAdapter"/> <property name="jpaVendorAdapter" ref="hibernateJpaVendorAdapter"/>
<property name="jpaProperties"> <property name="jpaProperties">
...@@ -125,11 +126,11 @@ ...@@ -125,11 +126,11 @@
<prop key="hibernate.connection.useUnicode">true</prop> <prop key="hibernate.connection.useUnicode">true</prop>
</props> </props>
</property> </property>
</bean> </bean>
<bean id="tkioEntityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"> <bean id="tkioEntityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="dataSource" ref="tkioDataSource"/> <property name="dataSource" ref="tkioDataSource"/>
<property name="packagesToScan" value="tkio.model"></property> <property name="packagesToScan" value="tkio.model"></property>
<property name="persistenceUnitName" value="tkioUnit" /> <property name="persistenceUnitName" value="tkioUnit"/>
<property name="jpaVendorAdapter" ref="hibernateJpaVendorAdapter"/> <property name="jpaVendorAdapter" ref="hibernateJpaVendorAdapter"/>
<property name="jpaProperties"> <property name="jpaProperties">
...@@ -147,7 +148,7 @@ ...@@ -147,7 +148,7 @@
<bean id="trackEntityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"> <bean id="trackEntityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="dataSource" ref="trackDataSource"/> <property name="dataSource" ref="trackDataSource"/>
<property name="packagesToScan" value="track.model"></property> <property name="packagesToScan" value="track.model"></property>
<property name="persistenceUnitName" value="tkrackUnit" /> <property name="persistenceUnitName" value="tkrackUnit"/>
<property name="jpaVendorAdapter" ref="hibernateJpaVendorAdapter"/> <property name="jpaVendorAdapter" ref="hibernateJpaVendorAdapter"/>
<property name="jpaProperties"> <property name="jpaProperties">
...@@ -165,7 +166,7 @@ ...@@ -165,7 +166,7 @@
<bean id="dmpEntityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"> <bean id="dmpEntityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="dataSource" ref="dmpDataSource"/> <property name="dataSource" ref="dmpDataSource"/>
<property name="packagesToScan" value="dmp.model"></property> <property name="packagesToScan" value="dmp.model"></property>
<property name="persistenceUnitName" value="dmpUnit" /> <property name="persistenceUnitName" value="dmpUnit"/>
<property name="jpaVendorAdapter" ref="hibernateJpaVendorAdapter"/> <property name="jpaVendorAdapter" ref="hibernateJpaVendorAdapter"/>
<property name="jpaProperties"> <property name="jpaProperties">
...@@ -183,7 +184,7 @@ ...@@ -183,7 +184,7 @@
<bean id="ioEntityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"> <bean id="ioEntityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="dataSource" ref="ioDataSource"/> <property name="dataSource" ref="ioDataSource"/>
<property name="packagesToScan" value="userio.model"></property> <property name="packagesToScan" value="userio.model"></property>
<property name="persistenceUnitName" value="ioUnit" /> <property name="persistenceUnitName" value="ioUnit"/>
<property name="jpaVendorAdapter" ref="hibernateJpaVendorAdapter"/> <property name="jpaVendorAdapter" ref="hibernateJpaVendorAdapter"/>
<property name="jpaProperties"> <property name="jpaProperties">
...@@ -337,5 +338,5 @@ ...@@ -337,5 +338,5 @@
<property name="maxUploadSize" value="2000000"/> <property name="maxUploadSize" value="2000000"/>
</bean> </bean>
<bean id="appUtils" class="common.context.AppUtils" lazy-init="false" /> <bean id="appUtils" class="common.context.AppUtils" lazy-init="false"/>
</beans> </beans>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment