Skip to content

Commit 30c1b6b

Browse files
author
jamiesun
committed
add vcode & accounting
1 parent 387908f commit 30c1b6b

File tree

14 files changed

+2034
-1650
lines changed

14 files changed

+2034
-1650
lines changed

‎pom.xml

Lines changed: 192 additions & 187 deletions
Original file line numberDiff line numberDiff line change
@@ -1,187 +1,192 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
5-
6-
<groupId>org.toughradius</groupId>
7-
<artifactId>toughradius</artifactId>
8-
<version>latest</version>
9-
<packaging>jar</packaging>
10-
11-
<name>org.toughradius</name>
12-
<description>toughradius project</description>
13-
14-
<parent>
15-
<groupId>org.springframework.boot</groupId>
16-
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>2.1.0.RELEASE</version>
18-
<relativePath/> <!-- lookup parent from repository -->
19-
</parent>
20-
21-
<properties>
22-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24-
<java.version>1.8</java.version>
25-
<skipTests>true</skipTests>
26-
</properties>
27-
28-
<dependencies>
29-
<dependency>
30-
<groupId>org.springframework.boot</groupId>
31-
<artifactId>spring-boot-starter-actuator</artifactId>
32-
</dependency>
33-
<dependency>
34-
<groupId>org.springframework.boot</groupId>
35-
<artifactId>spring-boot-starter-cache</artifactId>
36-
</dependency>
37-
<dependency>
38-
<groupId>org.springframework.boot</groupId>
39-
<artifactId>spring-boot-starter-web</artifactId>
40-
</dependency>
41-
<dependency>
42-
<groupId>org.springframework.boot</groupId>
43-
<artifactId>spring-boot-starter-undertow</artifactId>
44-
</dependency>
45-
<dependency>
46-
<groupId>org.springframework.boot</groupId>
47-
<artifactId>spring-boot-starter-freemarker</artifactId>
48-
</dependency>
49-
<dependency>
50-
<groupId>org.mybatis.spring.boot</groupId>
51-
<artifactId>mybatis-spring-boot-starter</artifactId>
52-
<version>1.3.2</version>
53-
</dependency>
54-
<dependency>
55-
<groupId>org.springframework.boot</groupId>
56-
<artifactId>spring-boot-configuration-processor</artifactId>
57-
<optional>true</optional>
58-
</dependency>
59-
<dependency>
60-
<groupId>org.springframework.boot</groupId>
61-
<artifactId>spring-boot-starter-test</artifactId>
62-
<scope>test</scope>
63-
</dependency>
64-
<dependency>
65-
<groupId>com.alibaba</groupId>
66-
<artifactId>druid</artifactId>
67-
<version>1.1.9</version>
68-
</dependency>
69-
<dependency>
70-
<groupId>org.slf4j</groupId>
71-
<artifactId>slf4j-api</artifactId>
72-
<version>1.7.25</version>
73-
</dependency>
74-
<dependency>
75-
<groupId>org.ehcache</groupId>
76-
<artifactId>ehcache</artifactId>
77-
<version>3.5.2</version>
78-
</dependency>
79-
<dependency>
80-
<groupId>org.mybatis</groupId>
81-
<artifactId>mybatis</artifactId>
82-
<version>3.4.6</version>
83-
</dependency>
84-
<dependency>
85-
<groupId>org.mybatis.caches</groupId>
86-
<artifactId>mybatis-ehcache</artifactId>
87-
<version>1.1.0</version>
88-
</dependency>
89-
<dependency>
90-
<groupId>mysql</groupId>
91-
<artifactId>mysql-connector-java</artifactId>
92-
</dependency>
93-
<dependency>
94-
<groupId>org.apache.mina</groupId>
95-
<artifactId>mina-core</artifactId>
96-
<version>2.0.13</version>
97-
</dependency>
98-
<!--socket-->
99-
<dependency>
100-
<groupId>org.apache.mina</groupId>
101-
<artifactId>mina-integration-beans</artifactId>
102-
<exclusions>
103-
<exclusion>
104-
<groupId>org.apache.mina</groupId>
105-
<artifactId>mina-core</artifactId>
106-
</exclusion>
107-
</exclusions>
108-
<version>2.0.7</version>
109-
</dependency>
110-
<dependency>
111-
<groupId>com.github.qcloudsms</groupId>
112-
<artifactId>qcloudsms</artifactId>
113-
<version>1.0.5</version>
114-
</dependency>
115-
<dependency>
116-
<groupId>com.github.pagehelper</groupId>
117-
<artifactId>pagehelper-spring-boot-starter</artifactId>
118-
<version>1.2.3</version>
119-
</dependency>
120-
<dependency>
121-
<groupId>com.google.code.gson</groupId>
122-
<artifactId>gson</artifactId>
123-
<version>2.7</version>
124-
</dependency>
125-
<dependency>
126-
<groupId>org.gnu</groupId>
127-
<artifactId>gnu-crypto</artifactId>
128-
<version>2.0.1</version>
129-
</dependency>
130-
</dependencies>
131-
132-
<build>
133-
<plugins>
134-
<plugin>
135-
<groupId>org.springframework.boot</groupId>
136-
<artifactId>spring-boot-maven-plugin</artifactId>
137-
<configuration>
138-
<mainClass>org.toughradius.RadiusdApplication</mainClass>
139-
</configuration>
140-
<executions>
141-
<execution>
142-
<goals>
143-
<goal>repackage</goal>
144-
</goals>
145-
</execution>
146-
</executions>
147-
</plugin>
148-
<plugin>
149-
<artifactId>maven-compiler-plugin</artifactId>
150-
<configuration>
151-
<source>1.8</source>
152-
<target>1.8</target>
153-
<encoding>UTF-8</encoding>
154-
<compilerArguments>
155-
<extdirs>${project.basedir}/lib</extdirs>
156-
</compilerArguments>
157-
</configuration>
158-
</plugin>
159-
</plugins>
160-
<resources>
161-
<resource>
162-
<directory>lib</directory>
163-
<targetPath>BOOT-INF/lib/</targetPath>
164-
<includes>
165-
<include>**/*.jar</include>
166-
</includes>
167-
</resource>
168-
<resource>
169-
<directory>src/main/resources</directory>
170-
<targetPath>./</targetPath>
171-
</resource>
172-
</resources>
173-
</build>
174-
175-
<repositories>
176-
<repository>
177-
<id>spring-milestones</id>
178-
<name>Spring Milestones</name>
179-
<url>https://repo.spring.io/milestone</url>
180-
<snapshots>
181-
<enabled>false</enabled>
182-
</snapshots>
183-
</repository>
184-
</repositories>
185-
186-
187-
</project>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<groupId>org.toughradius</groupId>
7+
<artifactId>toughradius</artifactId>
8+
<version>latest</version>
9+
<packaging>jar</packaging>
10+
11+
<name>org.toughradius</name>
12+
<description>toughradius project</description>
13+
14+
<parent>
15+
<groupId>org.springframework.boot</groupId>
16+
<artifactId>spring-boot-starter-parent</artifactId>
17+
<version>2.1.0.RELEASE</version>
18+
<relativePath/> <!-- lookup parent from repository -->
19+
</parent>
20+
21+
<properties>
22+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24+
<java.version>1.8</java.version>
25+
<skipTests>true</skipTests>
26+
</properties>
27+
28+
<dependencies>
29+
<dependency>
30+
<groupId>org.springframework.boot</groupId>
31+
<artifactId>spring-boot-starter-actuator</artifactId>
32+
</dependency>
33+
<dependency>
34+
<groupId>org.springframework.boot</groupId>
35+
<artifactId>spring-boot-starter-cache</artifactId>
36+
</dependency>
37+
<dependency>
38+
<groupId>org.springframework.boot</groupId>
39+
<artifactId>spring-boot-starter-web</artifactId>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.springframework.boot</groupId>
43+
<artifactId>spring-boot-starter-undertow</artifactId>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.springframework.boot</groupId>
47+
<artifactId>spring-boot-starter-freemarker</artifactId>
48+
</dependency>
49+
<dependency>
50+
<groupId>org.mybatis.spring.boot</groupId>
51+
<artifactId>mybatis-spring-boot-starter</artifactId>
52+
<version>1.3.2</version>
53+
</dependency>
54+
<dependency>
55+
<groupId>org.springframework.boot</groupId>
56+
<artifactId>spring-boot-configuration-processor</artifactId>
57+
<optional>true</optional>
58+
</dependency>
59+
<dependency>
60+
<groupId>org.springframework.boot</groupId>
61+
<artifactId>spring-boot-starter-test</artifactId>
62+
<scope>test</scope>
63+
</dependency>
64+
<dependency>
65+
<groupId>com.alibaba</groupId>
66+
<artifactId>druid</artifactId>
67+
<version>1.1.9</version>
68+
</dependency>
69+
<dependency>
70+
<groupId>org.slf4j</groupId>
71+
<artifactId>slf4j-api</artifactId>
72+
<version>1.7.25</version>
73+
</dependency>
74+
<dependency>
75+
<groupId>org.ehcache</groupId>
76+
<artifactId>ehcache</artifactId>
77+
<version>3.5.2</version>
78+
</dependency>
79+
<dependency>
80+
<groupId>org.mybatis</groupId>
81+
<artifactId>mybatis</artifactId>
82+
<version>3.4.6</version>
83+
</dependency>
84+
<dependency>
85+
<groupId>org.mybatis.caches</groupId>
86+
<artifactId>mybatis-ehcache</artifactId>
87+
<version>1.1.0</version>
88+
</dependency>
89+
<dependency>
90+
<groupId>mysql</groupId>
91+
<artifactId>mysql-connector-java</artifactId>
92+
</dependency>
93+
<dependency>
94+
<groupId>org.apache.mina</groupId>
95+
<artifactId>mina-core</artifactId>
96+
<version>2.0.13</version>
97+
</dependency>
98+
<dependency>
99+
<groupId>com.github.penggle</groupId>
100+
<artifactId>kaptcha</artifactId>
101+
<version>2.3.2</version>
102+
</dependency>
103+
<!--socket-->
104+
<dependency>
105+
<groupId>org.apache.mina</groupId>
106+
<artifactId>mina-integration-beans</artifactId>
107+
<exclusions>
108+
<exclusion>
109+
<groupId>org.apache.mina</groupId>
110+
<artifactId>mina-core</artifactId>
111+
</exclusion>
112+
</exclusions>
113+
<version>2.0.7</version>
114+
</dependency>
115+
<dependency>
116+
<groupId>com.github.qcloudsms</groupId>
117+
<artifactId>qcloudsms</artifactId>
118+
<version>1.0.5</version>
119+
</dependency>
120+
<dependency>
121+
<groupId>com.github.pagehelper</groupId>
122+
<artifactId>pagehelper-spring-boot-starter</artifactId>
123+
<version>1.2.3</version>
124+
</dependency>
125+
<dependency>
126+
<groupId>com.google.code.gson</groupId>
127+
<artifactId>gson</artifactId>
128+
<version>2.7</version>
129+
</dependency>
130+
<dependency>
131+
<groupId>org.gnu</groupId>
132+
<artifactId>gnu-crypto</artifactId>
133+
<version>2.0.1</version>
134+
</dependency>
135+
</dependencies>
136+
137+
<build>
138+
<plugins>
139+
<plugin>
140+
<groupId>org.springframework.boot</groupId>
141+
<artifactId>spring-boot-maven-plugin</artifactId>
142+
<configuration>
143+
<mainClass>org.toughradius.RadiusdApplication</mainClass>
144+
</configuration>
145+
<executions>
146+
<execution>
147+
<goals>
148+
<goal>repackage</goal>
149+
</goals>
150+
</execution>
151+
</executions>
152+
</plugin>
153+
<plugin>
154+
<artifactId>maven-compiler-plugin</artifactId>
155+
<configuration>
156+
<source>1.8</source>
157+
<target>1.8</target>
158+
<encoding>UTF-8</encoding>
159+
<compilerArguments>
160+
<extdirs>${project.basedir}/lib</extdirs>
161+
</compilerArguments>
162+
</configuration>
163+
</plugin>
164+
</plugins>
165+
<resources>
166+
<resource>
167+
<directory>lib</directory>
168+
<targetPath>BOOT-INF/lib/</targetPath>
169+
<includes>
170+
<include>**/*.jar</include>
171+
</includes>
172+
</resource>
173+
<resource>
174+
<directory>src/main/resources</directory>
175+
<targetPath>./</targetPath>
176+
</resource>
177+
</resources>
178+
</build>
179+
180+
<repositories>
181+
<repository>
182+
<id>spring-milestones</id>
183+
<name>Spring Milestones</name>
184+
<url>https://repo.spring.io/milestone</url>
185+
<snapshots>
186+
<enabled>false</enabled>
187+
</snapshots>
188+
</repository>
189+
</repositories>
190+
191+
192+
</project>

‎scripts/freeradius-rest.conf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ rest {
3030
&acctInputOctets=%{urlquote:%{Acct-Input-Octets}}&acctOutputOctets=%{urlquote:%{Acct-Output-Octets}}\
3131
&acctInputGigawords=%{urlquote:%{Acct-Input-Gigawords}}&acctOutputGigawords=%{urlquote:%{Acct-Output-Gigawords}}\
3232
&acctInputPackets=%{urlquote:%{Acct-Input-Packets}}&acctOutputPackets=%{urlquote:%{Acct-Output-Packets}}\
33-
&nasPortId=%{urlquote:%{NAS-Port-Id}}&framedIPAddress=%{urlquote:%{Framed-IP-Address}}"
33+
&nasPortId=%{urlquote:%{NAS-Port-Id}}&framedIPAddress=%{urlquote:%{Framed-IP-Address}}\
34+
&sessionTimeout=%{urlquote:%{Session-Timeout}}&framedIPNetmask=%{urlquote:%{Framed-IP-Netmask}}\
35+
&acctStatusType=%{urlquote:%{Acct-Status-Type}}"
3436
}
3537

3638
pool {

0 commit comments

Comments
 (0)