feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.njyunzhi</groupId>
 	<artifactId>ubpa</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.0.1</version>
 	<name>ubpa</name>
 	<description>Demo project for Spring Boot</description>
 
@@ -24,7 +24,11 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>

src/main/java/com/njyunzhi/ubpa/UbpaApplication.java

@@ -2,7 +2,12 @@ package com.njyunzhi.ubpa;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+
+@EnableAsync
+@EnableTransactionManagement
 @SpringBootApplication
 public class UbpaApplication {
 

src/main/java/com/njyunzhi/ubpa/config/CorsConfig.java

@@ -1,26 +1,36 @@
 package com.njyunzhi.ubpa.config;
 
-import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-@SpringBootConfiguration
+// TODO
+// 这个配置实际上不生效，不知道为什么
+
+@Configuration
 public class CorsConfig implements WebMvcConfigurer {
+
+    @Value("${yz.cros}")
+    Boolean useCROS;
+
     @Override
     public void addCorsMappings(CorsRegistry registry) {
+        if (!useCROS) return;
+
 //        //添加映射路径
-//        registry.addMapping("/**")
-//                //是否发送Cookie
-//                .allowCredentials(true)
-//                //设置放行哪些原始域
-//                .allowedOrigins("*")
-//                //放行哪些请求方式
-//                .allowedMethods("GET", "POST", "PUT", "DELETE")
-//                //.allowedMethods("*") //或者放行全部
-//                //放行哪些原始请求头部信息
-//                .allowedHeaders("*")
-//                //暴露哪些原始请求头部信息
-//                .exposedHeaders("X-Authorization-JWT");
+        registry.addMapping("/**")
+                //是否发送Cookie
+                .allowCredentials(true)
+                //设置放行哪些原始域
+                .allowedOrigins("http://localhost:8000")
+                //放行哪些请求方式
+                .allowedMethods("GET", "POST", "PUT", "DELETE")
+                //.allowedMethods("*") //或者放行全部
+                //放行哪些原始请求头部信息
+                .allowedHeaders("*")
+                //暴露哪些原始请求头部信息
+                .exposedHeaders("Authorization");
     }
 }
 

src/main/java/com/njyunzhi/ubpa/controller/LoginController.java

@@ -58,7 +58,7 @@ public class LoginController extends BaseController {
         res.put("user", sysUser);
 
         // 生成 token
-        String token = JWTUtil.sign(sysUser.getUserId(), sysUser.getPassword());
+        String token = JWTUtil.sign(sysUser.getUserId(), sysUser.getUserId());
         res.put("token", token);
 
         return ResponseBean.success(res);

src/main/java/com/njyunzhi/ubpa/controller/TaOrgController.java

@@ -55,11 +55,13 @@ public class TaOrgController extends BaseController {
     @RequestMapping(value="/h5/org",method= RequestMethod.GET)
     @ApiOperation(value="客户端列表", notes = "客户端列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taOrgList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                  @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                  @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                  @ApiParam("企业名称") @RequestParam(value ="orgName", required = false) String orgName) throws Exception{
 
         IPage<TaOrg> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaOrg> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("status", Constants.STATUS_NORMAL);
+        queryWrapper.like(!StringUtils.isEmpty(orgName), "org_name", "%" + orgName + "%");
         queryWrapper.orderByDesc("org_name");
         queryWrapper.orderByDesc("create_date");
 
@@ -77,11 +79,11 @@ public class TaOrgController extends BaseController {
     @ApiOperation(value="管理端列表", notes = "管理端列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean getList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                @ApiParam("机构名称") @RequestParam(value ="orgName", required = false) String orgName) throws Exception{
+                                @ApiParam("企业名称") @RequestParam(value ="orgName", required = false) String orgName) throws Exception{
 
         IPage<TaOrg> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaOrg> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StringUtils.isEmpty(orgName), "org_name", "%" + orgName + "%");
+        queryWrapper.like(!StringUtils.isEmpty(orgName), "org_name", "%" + orgName + "%");
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.orderByDesc("create_date");
 
@@ -108,6 +110,9 @@ public class TaOrgController extends BaseController {
         }
 
         taOrg.setOrgId(null);
+        if (null == taOrg.getStatus()) {
+            taOrg.setStatus(Constants.STATUS_NORMAL);
+        }
 
         if (iTaOrgService.save(taOrg)){
             return ResponseBean.success(taOrg);
@@ -120,7 +125,7 @@ public class TaOrgController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/admin/orgId/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/org/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
     public ResponseBean taOrgDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
 
@@ -148,7 +153,7 @@ public class TaOrgController extends BaseController {
      * @param taOrg 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/orgId/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/org/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
     public ResponseBean taOrgUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaOrg taOrg) throws Exception{
@@ -179,7 +184,7 @@ public class TaOrgController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/admin/taOrg/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/org/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taOrgGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         TaOrg taOrg = iTaOrgService.getById(id);

src/main/java/com/njyunzhi/ubpa/controller/TaResumeWorkFormController.java

@@ -52,6 +52,7 @@ public class TaResumeWorkFormController extends BaseController {
     public ResponseBean taResumeWorkFormList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                              @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                              @ApiParam("企业ID") @RequestParam(value ="orgId", required = false) String orgId,
+                                             @ApiParam("申请人") @RequestParam(value ="userName", required = false) String userName,
                                              @ApiParam(value = "起始时间", example = "2022-03-01") @RequestParam(value ="start", required = false) String start,
                                              @ApiParam(value = "结束时间", example = "2022-03-31") @RequestParam(value ="end", required = false) String end) throws Exception{
 
@@ -61,6 +62,7 @@ public class TaResumeWorkFormController extends BaseController {
         IPage<TaResumeWorkForm> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaResumeWorkForm> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(!StringUtils.isEmpty(orgId), "org_id", orgId);
+        queryWrapper.like(!StringUtils.isEmpty(userName), "user_name", "%" + userName + "%");
         queryWrapper.ge(!StringUtils.isEmpty(start), "create_date", startDate);
         queryWrapper.le(!StringUtils.isEmpty(end), "create_date", endDate);
         queryWrapper.eq("status", Constants.STATUS_NORMAL);

src/main/java/com/njyunzhi/ubpa/exception/GlobalExceptionHandler.java

@@ -0,0 +1,19 @@
+package com.njyunzhi.ubpa.exception;
+
+import com.njyunzhi.ubpa.common.ResponseBean;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+@Slf4j
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+
+    @ResponseBody
+    @ExceptionHandler(Exception.class)
+    public ResponseBean handleException(Exception e){
+        log.error(e.getMessage(),e);
+        return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+    }
+}

src/main/java/com/njyunzhi/ubpa/shiro/FirstExceptionStrategy.java

@@ -0,0 +1,17 @@
+package com.njyunzhi.ubpa.shiro;
+
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.AuthenticationInfo;
+import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.authc.pam.AtLeastOneSuccessfulStrategy;
+import org.apache.shiro.realm.Realm;
+
+public class FirstExceptionStrategy extends AtLeastOneSuccessfulStrategy {
+
+    @Override
+    public AuthenticationInfo afterAttempt(Realm realm, AuthenticationToken token, AuthenticationInfo singleRealmInfo, AuthenticationInfo aggregateInfo, Throwable t) throws AuthenticationException {
+        if ((t instanceof AuthenticationException)) throw (AuthenticationException) t;
+        return super.afterAttempt(realm, token, singleRealmInfo, aggregateInfo, t);
+    }
+
+}

src/main/java/com/njyunzhi/ubpa/shiro/ShiroConfig.java

@@ -79,7 +79,8 @@ public class ShiroConfig {
         // 修改多 Realm 的处理逻辑
         ModularRealmAuthenticator realmAuthenticator = (ModularRealmAuthenticator) manager.getAuthenticator();
         // 主要有一个 Realm 成功, 就立即返回
-        realmAuthenticator.setAuthenticationStrategy(new AtLeastOneSuccessfulStrategy());
+//        realmAuthenticator.setAuthenticationStrategy(new AtLeastOneSuccessfulStrategy());
+        realmAuthenticator.setAuthenticationStrategy(new FirstExceptionStrategy());
 
         //  Use your own realm
         List<Realm> realmList = new ArrayList<Realm>() {{

src/main/java/com/njyunzhi/ubpa/shiro/filters/JWTFilter.java

@@ -1,6 +1,7 @@
 package com.njyunzhi.ubpa.shiro.filters;
 
 import com.njyunzhi.ubpa.shiro.utils.JWTUtil;
+import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationToken;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.web.filter.authc.AuthenticatingFilter;
@@ -62,6 +63,15 @@ public abstract class JWTFilter extends AuthenticatingFilter {
         return true;
     }
 
+    @Override
+    protected boolean onLoginFailure(AuthenticationToken token, AuthenticationException e, ServletRequest request, ServletResponse response) {
+        if (e != null) {
+            response401(request, response, e);
+        }
+
+        return false;
+    }
+
     /**
      *Jump illegal request to / 401
      */

src/main/resources/application-dev.yml

@@ -5,12 +5,15 @@ spring:
       max-file-size: 10MB
       max-request-size: 50MB
   datasource:
-    url: jdbc:mysql://110.40.183.156:3306/nanyang_machinery?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
-    username: nanyang_machinery
-    password: nanyang_machinery@ABCD1234
+    url: jdbc:mysql://110.40.183.156:3306/ubpa?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    username: ubpa
+    password: ubpa@ABCD1234
 
 ###
 logging:
   level:
     root: info
     springfox: info
+
+yz:
+  cros: true

src/main/resources/application-prod.yml

@@ -5,7 +5,9 @@ spring:
       max-file-size: 10MB
       max-request-size: 50MB
   datasource:
-    url: jdbc:mysql://110.40.183.156:3306/nanyang_machinery?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
-    username: nanyang_machinery
-    password: nanyang_machinery@ABCD1234
+    url: jdbc:mysql://110.40.183.156:3306/ubpa?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    username: ubpa
+    password: ubpa@ABCD1234
 
+yz:
+  cros: false

src/main/resources/application.yml

@@ -31,7 +31,7 @@ mybatis-plus:
 sms:
   captcha:
     code: SMS_207555188
-    sign: ????
+    sign: 云致科技
 
 ###
 yz: