fixbug

sxgk-projet/base-service/src/main/java/com/tofly/base/service/impl/AuthcodeServiceImpl.java

@@ -59,7 +59,7 @@ public class AuthcodeServiceImpl extends ServiceImpl<AuthcodeMapper, Authcode> i
     /**
      * 校验短信验证码
      */
-    //验证未通过
+    //验证tonguo
     private static final  int message_pass=1;
     //错误
     private static final  int message_error=2;

sxgk-projet/pom.xml

@@ -10,6 +10,7 @@
     <version>1.0-SNAPSHOT</version>
     <modules>
         <module>sxgk</module>
+        <module>base-service</module>
         <module>tofly-test1</module>
     </modules>
 

sxgk-projet/sxgk/pom.xml

@@ -35,7 +35,7 @@
             <artifactId>common-redis</artifactId>
             <version>1.0.0</version>
         </dependency>
-        <dependency>
+       <dependency>
             <groupId>com.tofly</groupId>
             <artifactId>common-mongo</artifactId>
             <version>1.0.0</version>

sxgk-projet/sxgk/src/main/resources/customMapper/CustomPersonWorkBenchMapper.xml

@@ -279,7 +279,7 @@
         left join (select invoice_id,
         sum(case
         when unit = '米' then
-        t.total * t.length3 / 1000
+        t.total * t.length / 1000
         else
         0
         end) length_total,
@@ -622,7 +622,7 @@
     <select id="sharpDataCount" resultType="java.util.Map">
 
         with material_Sum as
-        (select trunc(PIPE_TYPE_WIDTH) sharpData, sum( case when unit = '米' then  length3 * total else 0 end) / 1000 total
+        (select trunc(PIPE_TYPE_WIDTH) sharpData, sum( case when unit = '米' then  length * total else 0 end) / 1000 total
         from (select t1.*
         from (select a.*
         from tf_ywpn_materialinvoice_w a

sxgk-projet/tofly-auth/src/main/java/com/tofly/auth/config/ToflyWebSecurityConfiguration.java

@@ -47,8 +47,8 @@ public class ToflyWebSecurityConfiguration extends WebSecurityConfigurerAdapter
     public PasswordEncoder passwordEncoder(){
 
         //正式环境
-        return  PasswordEncoderFactories.createDelegatingPasswordEncoder();
-     //  return NoOpPasswordEncoder.getInstance();
+           return  PasswordEncoderFactories.createDelegatingPasswordEncoder();
+        // return NoOpPasswordEncoder.getInstance();
 
     }