Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xyqb-user2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
head_group
xyqb-user2
Commits
00f94d1f
Commit
00f94d1f
authored
Dec 19, 2017
by
Java—红包—徐 然
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
16cfa2f1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
19 deletions
+20
-19
pom.xml
pom.xml
+1
-13
Bootstrap.java
src/main/java/cn/quantgroup/xyqb/Bootstrap.java
+4
-1
application.properties
src/main/resources/config/dev/application.properties
+0
-3
TestUserLogin.java
src/test/java/user/TestUserLogin.java
+13
-2
app.properties
src/test/resources/META-INF/app.properties
+2
-0
No files found.
pom.xml
View file @
00f94d1f
...
@@ -228,7 +228,7 @@
...
@@ -228,7 +228,7 @@
<dependency>
<dependency>
<groupId>
com.ctrip.framework.apollo
</groupId>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo-client
</artifactId>
<artifactId>
apollo-client
</artifactId>
<version>
0.
9.2
</version>
<version>
0.
10.0
</version>
</dependency>
</dependency>
<!--<dependency>-->
<!--<dependency>-->
<!--<groupId>cn.quantgroup</groupId>-->
<!--<groupId>cn.quantgroup</groupId>-->
...
@@ -360,11 +360,6 @@
...
@@ -360,11 +360,6 @@
<profiles.activation>
dev
</profiles.activation>
<profiles.activation>
dev
</profiles.activation>
</properties>
</properties>
<dependencies>
<dependencies>
<dependency>
<groupId>
cn.quantgroup
</groupId>
<artifactId>
quantgroup-sms-sdk
</artifactId>
<version>
2.0.0.3-SNAPSHOT
</version>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
<resources>
<resources>
...
@@ -381,13 +376,6 @@
...
@@ -381,13 +376,6 @@
<properties>
<properties>
<profiles.activation>
test
</profiles.activation>
<profiles.activation>
test
</profiles.activation>
</properties>
</properties>
<dependencies>
<dependency>
<groupId>
cn.quantgroup
</groupId>
<artifactId>
quantgroup-sms-sdk
</artifactId>
<version>
2.0.0.3-SNAPSHOT
</version>
</dependency>
</dependencies>
<build>
<build>
<resources>
<resources>
<resource>
<resource>
...
...
src/main/java/cn/quantgroup/xyqb/Bootstrap.java
View file @
00f94d1f
package
cn
.
quantgroup
.
xyqb
;
package
cn
.
quantgroup
.
xyqb
;
import
com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig
;
import
com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig
;
import
com.ctrip.framework.apollo.spring.config.ApolloPropertySourceInitializer
;
import
com.weibo.api.motan.common.MotanConstants
;
import
com.weibo.api.motan.common.MotanConstants
;
import
com.weibo.api.motan.util.MotanSwitcherUtil
;
import
com.weibo.api.motan.util.MotanSwitcherUtil
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
...
@@ -21,7 +22,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
...
@@ -21,7 +22,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
@EnableAutoConfiguration
@EnableAutoConfiguration
@SpringBootApplication
@SpringBootApplication
@EnableCaching
@EnableCaching
@EnableApolloConfig
({
"application"
,
"tech.msg.sdk"
,
"cash.common"
})
//
@EnableApolloConfig({"application", "tech.msg.sdk", "cash.common"})
@PropertySource
(
value
=
{
"classpath:application.properties"
,
"classpath:xyqb.properties"
},
ignoreResourceNotFound
=
true
)
@PropertySource
(
value
=
{
"classpath:application.properties"
,
"classpath:xyqb.properties"
},
ignoreResourceNotFound
=
true
)
@Configuration
@Configuration
@EnableAspectJAutoProxy
@EnableAspectJAutoProxy
...
@@ -31,6 +32,8 @@ public class Bootstrap {
...
@@ -31,6 +32,8 @@ public class Bootstrap {
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
SpringApplication
springApplication
=
new
SpringApplication
(
Bootstrap
.
class
);
SpringApplication
springApplication
=
new
SpringApplication
(
Bootstrap
.
class
);
springApplication
.
addInitializers
(
new
ApolloPropertySourceInitializer
(
"application"
,
"tech.msg.sdk"
,
"cash.common"
));
springApplication
.
addListeners
(
new
ApplicationListener
<
ContextRefreshedEvent
>()
{
springApplication
.
addListeners
(
new
ApplicationListener
<
ContextRefreshedEvent
>()
{
@Override
@Override
public
void
onApplicationEvent
(
ContextRefreshedEvent
event
)
{
public
void
onApplicationEvent
(
ContextRefreshedEvent
event
)
{
...
...
src/main/resources/config/dev/application.properties
deleted
100644 → 0
View file @
16cfa2f1
security.sessions
=
if_required
spring.aop.proxy-target-class
=
true
src/test/java/user/TestUserLogin.java
View file @
00f94d1f
...
@@ -5,11 +5,20 @@ import cn.quantgroup.xyqb.Constants;
...
@@ -5,11 +5,20 @@ import cn.quantgroup.xyqb.Constants;
import
cn.quantgroup.xyqb.controller.external.user.InnerController
;
import
cn.quantgroup.xyqb.controller.external.user.InnerController
;
import
cn.quantgroup.xyqb.controller.internal.user.UserController
;
import
cn.quantgroup.xyqb.controller.internal.user.UserController
;
import
cn.quantgroup.xyqb.model.JsonResult
;
import
cn.quantgroup.xyqb.model.JsonResult
;
import
com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig
;
import
com.ctrip.framework.apollo.spring.config.ApolloPropertySourceInitializer
;
import
com.weibo.api.motan.common.MotanConstants
;
import
com.weibo.api.motan.util.MotanSwitcherUtil
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.junit.Test
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.junit.runner.RunWith
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.context.ApplicationListener
;
import
org.springframework.context.event.ContextRefreshedEvent
;
import
org.springframework.mock.web.MockHttpServletRequest
;
import
org.springframework.mock.web.MockHttpServletRequest
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
org.springframework.test.context.web.WebAppConfiguration
;
...
@@ -18,8 +27,8 @@ import org.springframework.test.context.web.WebAppConfiguration;
...
@@ -18,8 +27,8 @@ import org.springframework.test.context.web.WebAppConfiguration;
* Created by 11 on 2017/1/3.
* Created by 11 on 2017/1/3.
*/
*/
@RunWith
(
SpringJUnit4ClassRunner
.
class
)
@RunWith
(
SpringJUnit4ClassRunner
.
class
)
@SpringBootTest
(
classes
=
Bootstrap
.
class
)
@SpringBootTest
(
classes
=
Bootstrap
.
class
)
@
WebAppConfiguration
@
Slf4j
public
class
TestUserLogin
{
public
class
TestUserLogin
{
private
MockHttpServletRequest
request
;
private
MockHttpServletRequest
request
;
...
@@ -39,6 +48,8 @@ public class TestUserLogin {
...
@@ -39,6 +48,8 @@ public class TestUserLogin {
}
}
@Test
@Test
public
void
testJson
()
{
public
void
testJson
()
{
SpringApplication
springApplication
=
new
SpringApplication
(
Bootstrap
.
class
);
JsonResult
addressByUserId
=
innerController
.
findAddressByUserId
(
22L
);
JsonResult
addressByUserId
=
innerController
.
findAddressByUserId
(
22L
);
// JsonResult userByUserId = innerController.findUserByPhoneNo("17811111122");
// JsonResult userByUserId = innerController.findUserByPhoneNo("17811111122");
System
.
out
.
println
(
"-------------result:"
+
addressByUserId
);
System
.
out
.
println
(
"-------------result:"
+
addressByUserId
);
...
...
src/test/resources/META-INF/app.properties
0 → 100644
View file @
00f94d1f
app.id
=
xyqb-user2
namespace
=
application
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment