Skip to content

Commit 6587f67

Browse files
author
magiclu550
committed
[JSMOD@2_497_COMMIT] web api is finished
1 parent 0fafdf3 commit 6587f67

10 files changed

Lines changed: 11 additions & 102 deletions

.idea/artifacts/jsmod2.xml

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.idea/libraries/Maven__cn_jsmod2_jsmod2_emerald_1_0_3.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_26.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_6_RELEASE.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

JPLS/JPLS.iml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
4646
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.9" level="project" />
4747
<orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.13.0" level="project" />
48-
<orderEntry type="library" name="Maven: cn.jsmod2:jsmod2-emerald:1.0.3" level="project" />
4948
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-rest:2.1.6.RELEASE" level="project" />
5049
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-rest-webmvc:3.1.9.RELEASE" level="project" />
5150
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-rest-core:3.1.9.RELEASE" level="project" />
@@ -57,11 +56,6 @@
5756
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
5857
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.6.RELEASE" level="project" />
5958
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.6.RELEASE" level="project" />
60-
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.6.RELEASE" level="project" />
61-
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
62-
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
63-
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
64-
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.26" level="project" />
6559
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
6660
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.6.RELEASE" level="project" />
6761
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9" level="project" />

JPLS/pom.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -287,18 +287,19 @@
287287
<version>2.13.0</version>
288288
<scope>compile</scope>
289289
</dependency>
290-
<dependency>
291-
<groupId>cn.jsmod2</groupId>
292-
<artifactId>jsmod2-emerald</artifactId>
293-
<version>1.0.3</version>
294-
</dependency>
295290
<dependency>
296291
<groupId>org.springframework.boot</groupId>
297292
<artifactId>spring-boot-starter-data-rest</artifactId>
298293
</dependency>
299294
<dependency>
300295
<groupId>org.springframework.boot</groupId>
301296
<artifactId>spring-boot-starter-web</artifactId>
297+
<exclusions>
298+
<exclusion>
299+
<groupId>org.springframework.boot</groupId>
300+
<artifactId>spring-boot-starter-logging</artifactId>
301+
</exclusion>
302+
</exclusions>
302303
</dependency>
303304
<dependency>
304305
<groupId>org.springframework.session</groupId>

JPLS/src/main/java/cn/jsmod2/core/plugin/SpringContextUtil.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,11 @@ public static void loadBean(Class clz){
4747
//RequestMapping("/aa")+RequestMapping("/name");
4848
RequestMapping rm = m.getAnnotation(RequestMapping.class);
4949
String[] paths = rm.value();
50-
for(String path:paths) {
51-
try {
52-
RequestMappingInfo mappingInfo = (RequestMappingInfo) method.invoke(mapping, m, path);
53-
mapping.registerMapping(mappingInfo, configurableApplicationContext.getBean(beanName), m);
54-
}catch (Exception e){
55-
Utils.printException(e);
56-
}
50+
try {
51+
RequestMappingInfo mappingInfo = (RequestMappingInfo) method.invoke(mapping, m, clz);
52+
mapping.registerMapping(mappingInfo, configurableApplicationContext.getBean(beanName), m);
53+
}catch (Exception e){
54+
Utils.printException(e);
5755
}
5856
}
5957

0 commit comments

Comments
 (0)