diff --git a/pom.xml b/pom.xml
index 917f78ba6..4b37c0f67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,8 @@
9.0.96
1.2.13
5.3.39
+ 8.0.33
+ 11.2.0.4
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 011f42be4..d1e594f22 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -48,6 +48,7 @@
mysql
mysql-connector-java
+ ${jdbc-mysql.version}
@@ -73,7 +74,7 @@
com.oracle.database.jdbc
ojdbc6
- 11.2.0.4
+ ${jdbc-oracle.version}
cn.easyproject
diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/app/controller/AppBjCaController.java b/ruoyi-admin/src/main/java/com/neuhis/his/app/controller/AppBjCaController.java
new file mode 100644
index 000000000..dbdd31d2d
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/neuhis/his/app/controller/AppBjCaController.java
@@ -0,0 +1,32 @@
+package com.neuhis.his.app.controller;
+
+import com.neuhis.his.service.IBjCaService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 描述信息
+ *
+ * @author dazer
+ * @date 2025/3/4 15:14
+ **/
+@Api(value = "/open/bjca", tags = "北京CA")
+@RestController
+@RequestMapping("/open/bjca")
+@Slf4j
+public class AppBjCaController {
+ @Resource
+ private IBjCaService bjCaService;
+
+ @GetMapping("/startAutoSign")
+ public AjaxResult bjcaAuto() {
+ bjCaService.startAutoSign();
+ return AjaxResult.success("成功");
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/neuhis/his/app/controller/AppUnauthController.java b/ruoyi-admin/src/main/java/com/neuhis/his/app/controller/AppUnauthController.java
index cb4fdc8fe..119f571e4 100644
--- a/ruoyi-admin/src/main/java/com/neuhis/his/app/controller/AppUnauthController.java
+++ b/ruoyi-admin/src/main/java/com/neuhis/his/app/controller/AppUnauthController.java
@@ -41,18 +41,9 @@ public class AppUnauthController extends BaseController {
ISysUserService sysUserService;
@Autowired
private SysPasswordService passwordService;
- @Resource
- private IBjCaService bjCaService;
-
@Autowired
IComDictionaryService comDictionaryService;
- @GetMapping("/bjca/startAutoSign")
- public AjaxResult bjcaAuto() {
- bjCaService.startAutoSign();
- return AjaxResult.success("成功");
- }
-
@GetMapping("/getIp")
public AjaxResult getIp() {
String hostIp = IpUtils.getHostIp();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
index 9d0968309..86a2901fb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
@@ -2,6 +2,7 @@ package com.ruoyi.web.core.config;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.ruoyi.common.config.RuoYiConfig;
@@ -34,7 +35,7 @@ public class SwaggerConfig
@Bean
public Docket createRestApi()
{
- return new Docket(DocumentationType.OAS_30)
+ return new Docket(DocumentationType.OAS_30) //swagger3
// 是否启用Swagger
.enable(enabled)
// 用来创建该API的基本信息,展示在文档的页面中(自定义展示的信息)
@@ -69,4 +70,14 @@ public class SwaggerConfig
.version("版本号:" + ruoYiConfig.getVersion())
.build();
}
+
+ @Bean
+ public static BeanPostProcessor springfoxHandlerProviderBeanPostProcessor() {
+ return new BeanPostProcessor() {
+ @Override
+ public Object postProcessAfterInitialization(Object bean, String beanName) {
+ return bean;
+ }
+ };
+ }
}
diff --git a/ruoyi-admin/src/main/resources/application.properties b/ruoyi-admin/src/main/resources/application.properties
index f452cd5fb..2b0fea534 100644
--- a/ruoyi-admin/src/main/resources/application.properties
+++ b/ruoyi-admin/src/main/resources/application.properties
@@ -1,28 +1,29 @@
-# ??CA
-# CA????
+# \u5317\u4EACCA
+# CA\u670D\u52A1\u5730\u5740
nhit.dc.ca.bjxt01.server-query-user-info=http://192.168.216.112:10201/coss/service/v1/queryUserInfo
-# ??????
+# \u5F00\u542F\u81EA\u52A8\u7B7E\u540D
nhit.dc.ca.bjxt01.server-start-auth-sign=http://192.168.216.112:10201/coss/service/v1/startAutoSign
-# ??????
+# \u83B7\u53D6\u7B7E\u540D\u7ED3\u679C
nhit.dc.ca.bjxt01.server-get-sign-result=http://192.168.216.112:10201/coss/service/v1/getSignResult
-# ????
+# \u81EA\u52A8\u7B7E\u540D
nhit.dc.ca.bjxt01.server-auth-sign=http://192.168.216.112:10201/coss/service/v1/autoSign
-# ??????
+# \u9A8C\u8BC1\u6570\u636E\u7B7E\u540D
nhit.dc.ca.bjxt01.server-verify-sign=http://192.168.216.112:10201/coss/service/v1/verifySign
-# ??????
+# \u83B7\u53D6\u5370\u7AE0\u56FE\u7247
nhit.dc.ca.bjxt01.server-query-image=http://192.168.216.112:10201/coss/service/v1/queryImage
-# ?????
+# \u65F6\u95F4\u6233\u7B7E\u540D
nhit.dc.ca.bjxt01.server-tss-info=http://192.168.216.112:10201/coss/service/v1/createAndGetTssInfo
-# ???????
+# \u9A8C\u8BC1\u65F6\u95F4\u6233\u7B7E\u540D
nhit.dc.ca.bjxt01.server-verify-tss=http://192.168.216.112:10201/coss/service/v1/verifyTS
-## ????ca APPID
-# ???????
+### \u54B8\u9633\u624B\u9EBB
+# \u7B2C\u4E09\u65B9\u8D26\u53F7\u6807\u8BC6
nhit.dc.ca.bjxt01.app-id=APP_3FAE577489B649F78F70C861AA991AEE
-# ???????
+# \u7B2C\u4E09\u65B9\u8D26\u53F7\u79D8\u94A5
nhit.dc.ca.bjxt01.app-secret=MDAwNjY1MTZmMjczNDk4MDk2MzJhMTQ4OWYyZTdlNGE=
-## ????appid
-# ???????
+### \u54B8\u9633\u75C5\u5386
#nhit.dc.ca.bjxt01.app-id=APP_95BF9D123FCF498A83C344ED42473675
-# ???????
#nhit.dc.ca.bjxt01.app-secret=MzI1ODNlYTI2ZjkwNDkzZjg3MDhjOTMwMDBlZDYwOTQ=
+
+#\u5FC5\u73B0\u589E\u52A0\u8BE5\u6761\u76EE\uFF0C\u5426\u5219 springboot 2.7 \u96C6\u6210\uFF0Cswagger\u52A0\u8F7D\u4E0D\u5230\uFF0C\u63D0\u793A\uFF1ANo operations defined in spec!
+spring.mvc.pathmatch.matching-strategy=ant_path_matcher