接口完成

pine-admin/src/main/java/com/pine/admin/config/ShiroConfig.java

@@ -120,7 +120,7 @@ public class ShiroConfig {
     public ShiroFilterFactoryBean shiroFilter(SecurityManager securityManager) {
         ShiroFilterFactoryBean shiroFilter = new ShiroFilterFactoryBean();
         shiroFilter.setSecurityManager(securityManager);
-        shiroFilter.setLoginUrl("/dealer/login");
+        shiroFilter.setLoginUrl("/login");
 //        shiroFilter.setUnauthorizedUrl("/");
         //注意过滤器配置顺序 不能颠倒
         //配置退出 过滤器,其中的具体的退出代码Shiro已经替我们实现了，登出后跳转配置的loginUrl
@@ -133,7 +133,7 @@ public class ShiroConfig {
         filterMap.put("/swagger-resources/**", "anon");
         filterMap.put("/system/sysuser/*", "anon");
         filterMap.put("/statics/**", "anon");
-        filterMap.put("/dealer/login", "anon");
+        filterMap.put("/login", "anon");
 
 
         filterMap.put("/youpai/**", "anon");

pine-admin/src/main/java/com/pine/admin/modules/business/service/impl/CarOrderServiceImpl.java

@@ -237,13 +237,14 @@ public class CarOrderServiceImpl implements CarOrderService {
 
             String offlineaudit = PostUtil.httpPost(Constant.offlineaudit, data, "application/json");
 
+            log.info(offlineaudit);
             Map maps = (Map) JSON.parse(offlineaudit);
 
 
             if (maps.get("code").equals("1")) {
                 return true;
             } else {
-                return false;
+               throw new ApiException(maps.get("msg").toString());
             }
         } catch (Exception e) {
             log.error("offlineReview", e);
@@ -365,12 +366,13 @@ public class CarOrderServiceImpl implements CarOrderService {
             String refundinfo = PostUtil.httpPost(Constant.validatebacking, data, "application/json");
             log.info(refundinfo);
             Map maps = (Map) JSON.parse(refundinfo);
+            if (!maps.get("code").toString().equals("1")) {
+                throw new ApiException(maps.get("msg").toString());
+            }
             return maps.get("code").toString();
-
         } catch (Exception e) {
             log.info("delivery", e);
             throw new ApiException(e.getMessage());
-
         }
 
     }
@@ -401,7 +403,7 @@ public class CarOrderServiceImpl implements CarOrderService {
 
     public static void main(String[] args) {
         DecimalFormat decimalFormat = new DecimalFormat("0.##");
-        System.out.println(        decimalFormat.format(new BigDecimal(20))
+        System.out.println(decimalFormat.format(new BigDecimal(20))
         );
     }
 }

pine-admin/src/main/java/com/pine/admin/modules/system/controller/SysUserLoginController.java

@@ -62,42 +62,42 @@ public class SysUserLoginController {
         ImageIO.write(image, "jpg", out);
     }
 
-    @PostMapping("login")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "userCode", value = "用户名", example = "root", required = true, dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "password", value = "密码", example = "1234", required = true, dataType = "string", paramType = "query")
-//            @ApiImplicitParam(name = "rand", value = "验证码", example = "a",required = true, dataType = "string", paramType = "query")
-    })
-    public Result login(@RequestParam(required = true, value = "userCode") String userCode, @RequestParam(required = true, value = "password") String password, HttpServletResponse response
-    ) {
-
-//        if (!"a".equals(rand)){
-//            String kaptcha = ShiroUtils.getKaptcha(Constants.KAPTCHA_SESSION_KEY);
+//    @PostMapping("login")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "userCode", value = "用户名", example = "root", required = true, dataType = "String", paramType = "query"),
+//            @ApiImplicitParam(name = "password", value = "密码", example = "1234", required = true, dataType = "string", paramType = "query")
+////            @ApiImplicitParam(name = "rand", value = "验证码", example = "a",required = true, dataType = "string", paramType = "query")
+//    })
+//    public Result login(@RequestParam(required = true, value = "userCode") String userCode, @RequestParam(required = true, value = "password") String password, HttpServletResponse response
+//    ) {
 //
-//            if(!rand.equalsIgnoreCase(kaptcha)){
-//                return Result.error("验证码不正确");
-//            }
+////        if (!"a".equals(rand)){
+////            String kaptcha = ShiroUtils.getKaptcha(Constants.KAPTCHA_SESSION_KEY);
+////
+////            if(!rand.equalsIgnoreCase(kaptcha)){
+////                return Result.error("验证码不正确");
+////            }
+////        }
+//        String role = "0";
+//        try {
+//            Subject subject = ShiroUtils.getSubject();
+//            UsernamePasswordToken token = new UsernamePasswordToken(userCode, password);
+//            subject.login(token);
+//            SysUserRole sysUserRole = sysUserRoleService.selectByUser(ShiroUtils.getUserId());
+//        } catch (UnknownAccountException e) {
+//            return Result.error(e.getMessage());
+//        } catch (IncorrectCredentialsException e) {
+//            return Result.error("账号或密码不正确");
+//        } catch (LockedAccountException e) {
+//            return Result.error("账号已被锁定,请联系管理员");
+//        } catch (AuthenticationException e) {
+//            return Result.error("账户验证失败");
 //        }
-        String role = "0";
-        try {
-            Subject subject = ShiroUtils.getSubject();
-            UsernamePasswordToken token = new UsernamePasswordToken(userCode, password);
-            subject.login(token);
-            SysUserRole sysUserRole = sysUserRoleService.selectByUser(ShiroUtils.getUserId());
-        } catch (UnknownAccountException e) {
-            return Result.error(e.getMessage());
-        } catch (IncorrectCredentialsException e) {
-            return Result.error("账号或密码不正确");
-        } catch (LockedAccountException e) {
-            return Result.error("账号已被锁定,请联系管理员");
-        } catch (AuthenticationException e) {
-            return Result.error("账户验证失败");
-        }
-        return Result.success(true, ShiroUtils.getShiroUserInfo());
-    }
+//        return Result.success(true, ShiroUtils.getShiroUserInfo());
+//    }
 
 
-    @PostMapping("dealer/login")
+    @PostMapping("login")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "userCode", value = "用户名", example = "xxs2", required = true, dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "password", value = "密码", example = "123456", required = true, dataType = "string", paramType = "query")

pine-admin/src/main/resources/application.properties

@@ -19,8 +19,8 @@ logging.level.com.pine=DEBUG
 logging.path=/home/INFO_FILE.%d{yyyy-MM-dd}.gz
 logging.level.com.pine.admin.modules.system.dao=DEBUG
 ### mysql config ###
-spring.datasource.url=jdbc:mysql://39.108.234.18:3306/dealer?useUnicode=true&characterEncoding=utf8&useSSL=false
+spring.datasource.url=jdbc:mysql://119.3.200.232:3306/nanzhan?useUnicode=true&characterEncoding=utf8&useSSL=false
 spring.datasource.username=root
-spring.datasource.password=Pine1qaz!QAZ
+spring.datasource.password=pl,okmijn
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 logging.level.io.swagger.models.parameters.AbstractSerializableParameter=error

pine-admin/target/classes/application-dev.properties

@@ -1,31 +0,0 @@
-# \u9A71\u52A8\u914D\u7F6E\u4FE1\u606F
-#spring.datasource.url=jdbc:mysql://49.4.21.118:3306/renren
-#spring.datasource.username=root
-#spring.datasource.password=NJhby2018..
-#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-#\u8FDE\u63A5\u6C60\u7684\u914D\u7F6E\u4FE1\u606F
-spring.datasource.initialSize=5  
-spring.datasource.minIdle=5  
-spring.datasource.maxActive=20  
-spring.datasource.maxWait=60000  
-spring.datasource.timeBetweenEvictionRunsMillis=60000  
-spring.datasource.minEvictableIdleTimeMillis=300000  
-spring.datasource.validationQuery=SELECT 1 FROM DUAL  
-spring.datasource.testWhileIdle=true  
-spring.datasource.testOnBorrow=false  
-spring.datasource.testOnReturn=false  
-spring.datasource.poolPreparedStatements=true  
-spring.datasource.maxPoolPreparedStatementPerConnectionSize=20  
-spring.datasource.filters=stat,wall,log4j  
-spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-#\u5FAE\u4FE1appid
-wxAppId=wx82563ca212c7fd38
-wxSecret=1dcf984e4baac37c2f9dccce1273f569
-#\u963F\u91CC\u4E91OSS
-ossAccessKeyId=LTAI3wEaDKjYiFhv
-ossAccessKeySecret=WY68TRQzIkdve9LjS4Og8fHXZKmlE7
-ossSendPoint=http://oss-cn-hangzhou.aliyuncs.com
-ossBucketName=huabangyun
-ossImagerServer=http://huabangyun.oss-cn-hangzhou.aliyuncs.com
-
-

pine-admin/target/classes/application-prod.properties

@@ -1,56 +0,0 @@
-#\u7AEF\u53E3
-server.port=8888
-#servlet.context-path=/koi
-# \u9A71\u52A8\u914D\u7F6E\u4FE1\u606F
-#spring.boot.admin.url=http://localhost:9090
-#management.security.enabled=false
-### postgresql config ###
-#spring.datasource.url=jdbc:postgresql://192.168.1.253:5432/zhaopin
-#
-#spring.datasource.username=postgres
-#spring.datasource.password=postgres
-#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.redis.host=39.108.234.18
-# Redis服务器连接端口
-spring.redis.port=6379
-# Redis服务器连接密码（默认为空）
-spring.redis.password=pine7711
-# 连接池最大连接数（使用负值表示没有限制）
-spring.redis.pool.max-active=8
-# 连接池最大阻塞等待时间（使用负值表示没有限制）
-spring.redis.pool.max-wait=-1
-# 连接池中的最大空闲连接
-spring.redis.pool.max-idle=8
-# 连接池中的最小空闲连接
-spring.redis.pool.min-idle=0
-# 连接超时时间（毫秒）
-spring.redis.timeout=30000
-#\u8FDE\u63A5\u6C60\u7684\u914D\u7F6E\u4FE1\u606F
-spring.datasource.initialSize=5
-spring.datasource.minIdle=5
-spring.datasource.maxActive=20
-spring.datasource.maxWait=60000
-spring.datasource.timeBetweenEvictionRunsMillis=60000
-spring.datasource.minEvictableIdleTimeMillis=300000
-spring.datasource.validationQuery=SELECT 1 FROM DUAL
-spring.datasource.testWhileIdle=true
-spring.datasource.testOnBorrow=false
-spring.datasource.testOnReturn=false
-spring.datasource.poolPreparedStatements=true
-spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
-spring.datasource.filters=stat,wall,log4j
-spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-#EMALI 发送配置
-spring.mail.default-encoding=UTF-8
-spring.mail.host=smtp.qq.com
-#发送者的邮箱账号
-spring.mail.username=45380843@qq.com
-#发送者的邮箱密码
-spring.mail.password=augicbgyajvrbgcd
-#端口
-spring.mail.port=587
-#协议
-spring.mail.protocol=smtp
-spring.mail.properties.mail.smtp.auth=true
-spring.mail.properties.mail.smtp.starttls.enable=true
-spring.mail.properties.mail.smtp.starttls.required=true

pine-admin/target/classes/application-test.properties

@@ -1,31 +0,0 @@
-# \u9A71\u52A8\u914D\u7F6E\u4FE1\u606F
-#spring.datasource.url=jdbc:mysql://rm-bp14x23t9lalb9ftio.mysql.rds.aliyuncs.com:3306/yangche
-#spring.datasource.username=yangche
-#spring.datasource.password=3kkyDfQqUR
-#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-#\u8FDE\u63A5\u6C60\u7684\u914D\u7F6E\u4FE1\u606F
-spring.datasource.initialSize=5  
-spring.datasource.minIdle=5  
-spring.datasource.maxActive=20  
-spring.datasource.maxWait=60000  
-spring.datasource.timeBetweenEvictionRunsMillis=60000  
-spring.datasource.minEvictableIdleTimeMillis=300000  
-spring.datasource.validationQuery=SELECT 1 FROM DUAL  
-spring.datasource.testWhileIdle=true  
-spring.datasource.testOnBorrow=false  
-spring.datasource.testOnReturn=false  
-spring.datasource.poolPreparedStatements=true  
-spring.datasource.maxPoolPreparedStatementPerConnectionSize=20  
-spring.datasource.filters=stat,wall,log4j  
-spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-#\u5FAE\u4FE1appid
-wxAppId=wx82563ca212c7fd38
-wxSecret=1dcf984e4baac37c2f9dccce1273f569
-#\u963F\u91CC\u4E91OSS
-ossAccessKeyId=LTAI3wEaDKjYiFhv
-ossAccessKeySecret=WY68TRQzIkdve9LjS4Og8fHXZKmlE7
-ossSendPoint=http://oss-cn-hangzhou.aliyuncs.com
-ossBucketName=huabangyun
-ossImagerServer=http://huabangyun.oss-cn-hangzhou.aliyuncs.com
-
-

pine-admin/target/classes/application.properties

@@ -1,26 +0,0 @@
-#tomcat\u914D\u7F
-spring.application.name=dealer
-server.tomcat.uri-encoding=UTF-8
-server.tomcat.max-threads:1000
-server.tomcat.mix-threads:30
-#server.context-path=/best
-# \u73AF\u5883 dev|test|pro
-spring.profiles.active=prod
-#\u70ED\u90E8\u7F72\u914D\u7F6E
-spring.devtools.livereload.enabled=true
-spring.devtools.restart.enabled=true
-spring.aop.proxy-target-class=true
-#Mapper����
-mybatis.mapper-locations:classpath:/mapper/**/*Dao.xml
-mybatis.typeAliasesPackage:com.pine.admin.*.entity
-mybatis.configuration.mapUnderscoreToCamelCase=true
-#��־��ӡSQL
-logging.level.com.pine=DEBUG
-logging.path=/home/INFO_FILE.%d{yyyy-MM-dd}.gz
-logging.level.com.pine.admin.modules.system.dao=DEBUG
-### mysql config ###
-spring.datasource.url=jdbc:mysql://39.108.234.18:3306/dealer?useUnicode=true&characterEncoding=utf8
-spring.datasource.username=root
-spring.datasource.password=Pine1qaz!QAZ
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-

pine-admin/target/classes/banner.txt

@@ -1,12 +0,0 @@
-
-
-            //                                                              //
-            //                    ______   _                                //
-            //                    | ___ \ (_)                               //
-            //                    | |_/ /  _   _ __     ___                 //
-            //                    |  __/  | | | '_ \   / _ \                //
-            //                    | |     | | | | | | |  __/                //
-            //                    \_|     |_| |_| |_|  \___|                //
-            //                                                              //
-            //  Pine先生保佑   🙏                             🙏   代码永无bug //
-