diff --git a/openhis-server-new/core-admin/pom.xml b/openhis-server-new/core-admin/pom.xml index 227e9fe0a6e24075c5663a44eca5b2a45f414b21..8fc2c124da333e9da01130c81eb1b159059b342b 100644 --- a/openhis-server-new/core-admin/pom.xml +++ b/openhis-server-new/core-admin/pom.xml @@ -36,13 +36,11 @@ io.swagger swagger-models - 1.6.2 - - mysql - mysql-connector-java + com.mysql + mysql-connector-j diff --git a/openhis-server-new/core-common/pom.xml b/openhis-server-new/core-common/pom.xml index b61f1a54b3f531a46cf18bb8a653fbf6025f2676..c6b5ea4c8c4099e2ba1d90a4833898982b4679fb 100644 --- a/openhis-server-new/core-common/pom.xml +++ b/openhis-server-new/core-common/pom.xml @@ -77,6 +77,10 @@ com.alibaba.fastjson2 fastjson2 + + com.alibaba + fastjson + @@ -136,7 +140,6 @@ com.belerweb pinyin4j - 2.5.1 diff --git a/openhis-server-new/core-flowable/pom.xml b/openhis-server-new/core-flowable/pom.xml index 2c04776950aeb6b29355ab16a1b6c80d855fb9ac..a96ef821e05671727278eaf603f8368803605591 100644 --- a/openhis-server-new/core-flowable/pom.xml +++ b/openhis-server-new/core-flowable/pom.xml @@ -80,7 +80,6 @@ com.googlecode.aviator aviator - 5.3.3 diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/SecurityConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/SecurityConfig.java index 5154bbd20184efaa834cc3713dd7fb4a4e8c5044..e6bf5241f900f1e10c96bca84c1f5270f77b1410 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/SecurityConfig.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/SecurityConfig.java @@ -1,5 +1,9 @@ package com.core.framework.config; +import com.core.framework.config.properties.PermitAllUrlProperties; +import com.core.framework.security.filter.JwtAuthenticationTokenFilter; +import com.core.framework.security.handle.AuthenticationEntryPointImpl; +import com.core.framework.security.handle.LogoutSuccessHandlerImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -7,7 +11,7 @@ import org.springframework.http.HttpMethod; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.ProviderManager; import org.springframework.security.authentication.dao.DaoAuthenticationProvider; -import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.core.userdetails.UserDetailsService; @@ -17,17 +21,12 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic import org.springframework.security.web.authentication.logout.LogoutFilter; import org.springframework.web.filter.CorsFilter; -import com.core.framework.config.properties.PermitAllUrlProperties; -import com.core.framework.security.filter.JwtAuthenticationTokenFilter; -import com.core.framework.security.handle.AuthenticationEntryPointImpl; -import com.core.framework.security.handle.LogoutSuccessHandlerImpl; - /** * spring security配置 - * + * * @author system */ -@EnableMethodSecurity(prePostEnabled = true, securedEnabled = true) +@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) @Configuration public class SecurityConfig { /** @@ -86,38 +85,38 @@ public class SecurityConfig { @Bean protected SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception { return httpSecurity - // CSRF禁用,因为不使用session - .csrf(csrf -> csrf.disable()) - // 禁用HTTP响应标头 - .headers((headersCustomizer) -> { - headersCustomizer.cacheControl(cache -> cache.disable()).frameOptions(options -> options.sameOrigin()); - }) - // 认证失败处理类 - .exceptionHandling(exception -> exception.authenticationEntryPoint(unauthorizedHandler)) - // 基于token,所以不需要session - .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) - // 注解标记允许匿名访问的url - .authorizeHttpRequests((requests) -> { - permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll()); - // 对于登录login 注册register 验证码captchaImage 允许匿名访问 - requests.antMatchers("/login", "/register", "/captchaImage").permitAll() - // 静态资源,可匿名访问 - .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**") - .permitAll() - .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**") - .permitAll() - .antMatchers("/patientmanage/information/**") - .permitAll() - // 除上面外的所有请求全部需要鉴权认证 - .anyRequest().authenticated(); - }) - // 添加Logout filter - .logout(logout -> logout.logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler)) - // 添加JWT filter - .addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class) - // 添加CORS filter - .addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class) - .addFilterBefore(corsFilter, LogoutFilter.class).build(); + // CSRF禁用,因为不使用session + .csrf(csrf -> csrf.disable()) + // 禁用HTTP响应标头 + .headers((headersCustomizer) -> { + headersCustomizer.cacheControl(cache -> cache.disable()).frameOptions(options -> options.sameOrigin()); + }) + // 认证失败处理类 + .exceptionHandling(exception -> exception.authenticationEntryPoint(unauthorizedHandler)) + // 基于token,所以不需要session + .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + // 注解标记允许匿名访问的url + .authorizeHttpRequests((requests) -> { + permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll()); + // 对于登录login 注册register 验证码captchaImage 允许匿名访问 + requests.antMatchers("/login", "/register", "/captchaImage").permitAll() + // 静态资源,可匿名访问 + .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**") + .permitAll() + .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**") + .permitAll() + .antMatchers("/patientmanage/information/**") + .permitAll() + // 除上面外的所有请求全部需要鉴权认证 + .anyRequest().authenticated(); + }) + // 添加Logout filter + .logout(logout -> logout.logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler)) + // 添加JWT filter + .addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class) + // 添加CORS filter + .addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class) + .addFilterBefore(corsFilter, LogoutFilter.class).build(); } /** diff --git a/openhis-server-new/core-system/pom.xml b/openhis-server-new/core-system/pom.xml index ff3e37c8894fafd0547983235ed421eb6f77efd2..427f75db7fa93bc41e450fa11e2dbff863cb24de 100644 --- a/openhis-server-new/core-system/pom.xml +++ b/openhis-server-new/core-system/pom.xml @@ -23,15 +23,11 @@ com.core core-common - - org.projectlombok - lombok - true - + + io.swagger swagger-annotations - compile diff --git a/openhis-server-new/openhis-application/pom.xml b/openhis-server-new/openhis-application/pom.xml index 3871158bf39faf87f84322fcb6accd58069880a6..18f038e6c245d2186549df4c4d762b4d663fd4c0 100644 --- a/openhis-server-new/openhis-application/pom.xml +++ b/openhis-server-new/openhis-application/pom.xml @@ -23,18 +23,21 @@ true + + cn.hutool + hutool-all + + com.openhis openhis-domain - 0.0.1-SNAPSHOT com.yomahub liteflow-spring-boot-starter - 2.12.4.1 @@ -43,11 +46,10 @@ junit test + - com.alibaba - fastjson - 2.0.43 - compile + com.alibaba.fastjson2 + fastjson2 org.apache.httpcomponents @@ -61,7 +63,6 @@ org.springframework.boot spring-boot-maven-plugin - 2.5.15 true @@ -76,20 +77,12 @@ org.apache.maven.plugins maven-war-plugin - 3.1.0 + ${maven-war-plugin.version} false ${project.artifactId} - - org.apache.maven.plugins - maven-compiler-plugin - - 17 - 17 - - ${project.artifactId} diff --git a/openhis-server-new/openhis-common/pom.xml b/openhis-server-new/openhis-common/pom.xml index ddc5cc7d04e8db279c99ee2d05f9e5ff83c0ba74..4f5f2f6f097f4fd45e21af8c5a453fc5786b3feb 100644 --- a/openhis-server-new/openhis-common/pom.xml +++ b/openhis-server-new/openhis-common/pom.xml @@ -21,7 +21,6 @@ com.core core-admin - 0.0.1-SNAPSHOT diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MedCategoryCode.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MedCategoryCode.java new file mode 100644 index 0000000000000000000000000000000000000000..d8a9a54b67d054bd30978e3c8a59be33e1e1c1b9 --- /dev/null +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MedCategoryCode.java @@ -0,0 +1,49 @@ +package com.openhis.common.enums; + +/** + * medCategoryCode + * + * @author Wuser + * @date 2025/4/21 + */ + +import com.github.pagehelper.util.StringUtil; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 药品分类枚举 + * + * @author YourName + * @date 2025-04-21 + */ +@Getter +@AllArgsConstructor +public enum MedCategoryCode { + + TRADITIONAL_CHINESE_MEDICINE("1", "中成药"), + + WESTERN_MEDICINE("2", "西药"), + + EXTERNAL_PURCHASE_MEDICINE("3", "外购药品"), + + CHINESE_HERBAL_MEDICINE("4", "中草药"), + + OTHER("9", "其他"); + + private String value; + private String description; + + public static MedCategoryCode getByValue(String value) { + if (StringUtil.isEmpty(value)) { + return null; + } + for (MedCategoryCode code : values()) { + if (code.getValue().equals(value)) { + return code; + } + } + return null; + } +} \ No newline at end of file diff --git a/openhis-server-new/openhis-domain/pom.xml b/openhis-server-new/openhis-domain/pom.xml index ba277953a88489cf46f42c5666d36f54dbdb11b9..34c31894f7c4c28c586e86e1b22356598446959a 100644 --- a/openhis-server-new/openhis-domain/pom.xml +++ b/openhis-server-new/openhis-domain/pom.xml @@ -15,26 +15,13 @@ 领域 - - - - org.apache.maven.plugins - maven-compiler-plugin - - 16 - 16 - - - - + - com.alibaba - fastjson - 2.0.43 - compile + com.alibaba.fastjson2 + fastjson2 org.apache.httpcomponents @@ -44,7 +31,12 @@ com.openhis openhis-common - 0.0.1-SNAPSHOT + + + + org.springframework.boot + spring-boot-starter-web + provided diff --git a/openhis-server-new/openhis-einvoiceapp/pom.xml b/openhis-server-new/openhis-einvoiceapp/pom.xml index 0069eb70409e78ac2b8baef0025d78c5b005e0d9..7294902ae61edb4086058d6fe0acdf0182c279b2 100644 --- a/openhis-server-new/openhis-einvoiceapp/pom.xml +++ b/openhis-server-new/openhis-einvoiceapp/pom.xml @@ -27,13 +27,11 @@ org.springframework.boot spring-boot-starter - 2.5.15 + - com.alibaba - fastjson - 2.0.43 - compile + com.alibaba.fastjson2 + fastjson2 org.apache.httpcomponents @@ -43,14 +41,12 @@ com.openhis openhis-common - 0.0.1-SNAPSHOT com.yomahub liteflow-spring-boot-starter - 2.12.4.1 org.springframework.boot @@ -60,49 +56,31 @@ cn.hutool hutool-all - 5.3.8 + org.bouncycastle bcprov-jdk15on - 1.69 - - - com.alibaba - fastjson - 2.0.43 - - - commons-httpclient - commons-httpclient - 3.1 - - - org.apache.httpcomponents - httpclient - 4.5.5 + + com.itextpdf kernel - 7.1.2 org.apache.httpcomponents httpmime - 4.5 com.itextpdf itextpdf - 5.5.12 com.itextpdf itext-asian - 5.2.0 @@ -112,7 +90,6 @@ org.springframework.boot spring-boot-maven-plugin - 2.5.15 true @@ -127,21 +104,12 @@ org.apache.maven.plugins maven-war-plugin - 3.1.0 + ${maven-war-plugin.version} false ${project.artifactId} - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 9 - 9 - - ${project.artifactId} diff --git a/openhis-server-new/openhis-miniapp/pom.xml b/openhis-server-new/openhis-miniapp/pom.xml index 7b2515739051683194a7ce59638e7ebb1a0f7034..6f22ccc70adbaca53682b6c152d3feb9d971e99f 100644 --- a/openhis-server-new/openhis-miniapp/pom.xml +++ b/openhis-server-new/openhis-miniapp/pom.xml @@ -21,7 +21,6 @@ com.openhis openhis-domain - 0.0.1-SNAPSHOT @@ -31,7 +30,6 @@ org.springframework.boot spring-boot-maven-plugin - 2.5.15 true @@ -46,20 +44,12 @@ org.apache.maven.plugins maven-war-plugin - 3.1.0 + ${maven-war-plugin.version} false ${project.artifactId} - - org.apache.maven.plugins - maven-compiler-plugin - - 8 - 8 - - ${project.artifactId} diff --git a/openhis-server-new/pom.xml b/openhis-server-new/pom.xml index 00cba8427714de080a54e1337f961bc3800d2714..a9bb21f49cc3b23f906b72457aeec7fc048d1547 100644 --- a/openhis-server-new/pom.xml +++ b/openhis-server-new/pom.xml @@ -4,6 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.5.15 + + + com.openhis openhis-server 0.0.1-SNAPSHOT @@ -16,15 +23,13 @@ 0.0.1-SNAPSHOT UTF-8 UTF-8 - 1.8 + 17 3.1.1 - 2.5.15 - 1.2.23 + 1.2.27 1.21 3.0.0 2.3.3 1.4.7 - 2.0.53 6.6.5 2.13.0 4.1.2 @@ -33,17 +38,128 @@ 9.0.96 1.2.13 - 5.7.12 - 5.3.39 1.18.26 3.5.3 6.8.0 42.2.27 + 5.3.3 + 1.5.21 + 2.0.58 + 1.6.2 + 2.5.1 + 2.12.4.1 + 5.3.8 + 1.69 + 7.1.2 + 5.5.12 + 5.2.0 + 9.4.0 + + + org.projectlombok + lombok + true + provided + + + + + com.mysql + mysql-connector-j + ${mysql-connector-j.version} + + + + + com.itextpdf + itextpdf + ${itextpdf.version} + + + com.itextpdf + itext-asian + ${itext-asian.version} + + + + cn.hutool + hutool-all + ${hutool-all.version} + + + + org.bouncycastle + bcprov-jdk15on + ${bcprov-jdk15on.version} + + + + + com.itextpdf + kernel + ${kernel.version} + + + + + + com.core + core-admin + ${project.version} + + + + + com.yomahub + liteflow-spring-boot-starter + ${liteflow-spring-boot-starter.version} + + + + + com.belerweb + pinyin4j + ${pinyin4j.version} + + + + + io.swagger + swagger-models + ${swagger-models.version} + + + + com.alibaba.fastjson2 + fastjson2 + ${fastjson2.version} + + + + com.alibaba + fastjson + ${fastjson2.version} + + + + + io.swagger + swagger-annotations + ${swagger-annotations.version} + + + + + + com.googlecode.aviator + aviator + ${aviator.version} + @@ -122,68 +238,6 @@ ${mybatis-plus.version} - - - org.projectlombok - lombok - ${lombok.version} - - - - - org.springframework - spring-framework-bom - ${spring-framework.version} - pom - import - - - - - org.springframework.security - spring-security-bom - ${spring-security.version} - pom - import - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - - ch.qos.logback - logback-core - ${logback.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - - - org.apache.tomcat.embed - tomcat-embed-core - ${tomcat.version} - - - org.apache.tomcat.embed - tomcat-embed-el - ${tomcat.version} - - - org.apache.tomcat.embed - tomcat-embed-websocket - ${tomcat.version} - @@ -247,13 +301,6 @@ ${velocity.version} - - - com.alibaba.fastjson2 - fastjson2 - ${fastjson.version} - - io.jsonwebtoken @@ -268,14 +315,6 @@ ${kaptcha.version} - - - io.swagger - swagger-annotations - 1.5.21 - compile - - org.flowable @@ -283,13 +322,6 @@ ${flowable.version} - - - com.googlecode.aviator - aviator - 5.3.3 - - org.postgresql postgresql @@ -311,6 +343,7 @@ core-generator core-common core-flowable + openhis-einvoiceapp pom @@ -319,10 +352,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + ${maven-compiler-plugin.version} - 17 - 17 + ${java.version} + ${java.version} ${project.build.sourceEncoding}