删除无用代码

config/run/bootstrap.yml

@@ -5,15 +5,15 @@ spring:
     allow-circular-references: true
   cloud:
     nacos:
-      username: nacos
-      password: weCaht@zm2023
+      username:
+      password:
       # 配置中心
       config:
         # 命名空间id(此处不用public,因public初始化的空间, id为空)  4e237601-cea8-414d-b7b9-d7adc8cbcf95
 #        namespace: 41746f91-0939-4e2b-b88e-095d52518465 #生产
-        namespace: 0c644b7e-505b-4c39-bee2-297e828abc17  #测试
+        namespace: 8ceef986-b754-4f19-96c3-7ae6c8cec1c2  #测试
         # nacos的ip地址和端口
-        server-addr: 10.1.4.71:8848
+        server-addr: 192.168.0.250:8848
         # 这个就表示 在我们nacos命名空间id为 dev中 有一个data-id 为 demo-service.yml 的配置文件 读取这个里面的配置
         file-extension: yml
         config-retry-time: 300000

linkwe-ai/src/test/java/com/linkwechat/coal/LinkweAiApplicationTests.java

@@ -1,13 +1,13 @@
-package com.linkwechat.coal;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class LinkweAiApplicationTests {
-
-    @Test
-    void contextLoads() {
-    }
-
-}
+//package com.linkwechat.coal;
+//
+//import org.junit.jupiter.api.Test;
+//import org.springframework.boot.test.context.SpringBootTest;
+//
+//@SpringBootTest
+//class LinkweAiApplicationTests {
+//
+//    @Test
+//    void contextLoads() {
+//    }
+//
+//}

linkwe-auth/src/main/java/com/linkwechat/web/service/SysLoginService.java

@@ -91,33 +91,33 @@ public class SysLoginService {
      */
     public Map<String, Object> login(String userName, String password) {
         SysUser sysUser = sysUserService.selectUserByUserName(userName);
-        if (StringUtils.isNull(sysUser)) {
-            throw new WeComException("用户名或密码错误，请重新输入！");
-        }
-
-        // 密码解密
-        try {
-            password = SecurityUtils.Base64Decode3(password);
-        } catch (Exception e) {
-            throw new WeComException("密码解密失败！");
-        }
-
-        if ("admin".equals(userName)) {
-            if (!SecurityUtils.matchesPassword(password, sysUser.getPassword())) {
-                throw new WeComException("用户名或密码错误，请重新输入");
-            }
-        }else {
-            if (StringUtils.isEmpty(sysUser.getPassword())) {
-                // 设置默认密码
-                sysUser.setPassword(new BCryptPasswordEncoder().encode("zmbx@Z023"));
-                sysUserService.updateById(sysUser);
-                log.info("设置默认密码不校验");
-            }else {
-                if (!SecurityUtils.matchesPassword(password, sysUser.getPassword())) {
-                    throw new WeComException("用户名或密码错误，请重新输入");
-                }
-            }
-        }
+//        if (StringUtils.isNull(sysUser)) {
+//            throw new WeComException("用户名或密码错误，请重新输入！");
+//        }
+//
+//        // 密码解密
+//        try {
+//            password = SecurityUtils.Base64Decode3(password);
+//        } catch (Exception e) {
+//            throw new WeComException("密码解密失败！");
+//        }
+//
+//        if ("admin".equals(userName)) {
+//            if (!SecurityUtils.matchesPassword(password, sysUser.getPassword())) {
+//                throw new WeComException("用户名或密码错误，请重新输入");
+//            }
+//        }else {
+//            if (StringUtils.isEmpty(sysUser.getPassword())) {
+//                // 设置默认密码
+//                sysUser.setPassword(new BCryptPasswordEncoder().encode("zmbx@Z023"));
+//                sysUserService.updateById(sysUser);
+//                log.info("设置默认密码不校验");
+//            }else {
+//                if (!SecurityUtils.matchesPassword(password, sysUser.getPassword())) {
+//                    throw new WeComException("用户名或密码错误，请重新输入");
+//                }
+//            }
+       // }
         LoginUser sysUserVo = findLoginUser(sysUser);
 
         // 生成token

linkwe-chinacoal/pom.xml

@@ -59,11 +59,6 @@
             <scope>compile</scope>
         </dependency>
         <!--    oracle    -->
-        <dependency>
-            <groupId>com.oracle</groupId>
-            <artifactId>ojdbc14</artifactId>
-            <version>6</version>
-        </dependency>
         <!--    mysql    -->
         <dependency>
             <groupId>mysql</groupId>

linkwe-common/pom.xml

@@ -312,6 +312,12 @@
             <artifactId>orika-core</artifactId>
             <version>1.5.2</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>5.6.15.Final</version>
+        </dependency>
     </dependencies>
 
     <build>

linkwe-common/src/main/java/com/linkwechat/common/utils/ip/IpUtils.java

@@ -7,7 +7,6 @@ import javax.servlet.http.HttpServletRequest;
 import com.linkwechat.common.utils.StringUtils;
 import com.linkwechat.common.utils.html.EscapeUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.omg.CORBA.UNKNOWN;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 
 /**

linkwe-scheduler/pom.xml

@@ -115,11 +115,7 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
         <!--    oracle    -->
-        <dependency>
-            <groupId>com.oracle</groupId>
-            <artifactId>ojdbc14</artifactId>
-            <version>6</version>
-        </dependency>
+
         <!--    mysql    -->
         <dependency>
             <groupId>mysql</groupId>

linkwe-service/src/main/java/com/linkwechat/service/impl/WeLeaveUserServiceImpl.java

@@ -50,11 +50,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.security.acl.Group;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static cn.hutool.core.collection.IterUtil.forEach;
 
 @Service
 public class WeLeaveUserServiceImpl extends ServiceImpl<SysLeaveUserMapper,SysLeaveUser> implements IWeLeaveUserService {

linkwe-service/src/main/java/com/linkwechat/service/impl/WeMomentsServiceImpl.java

@@ -33,8 +33,6 @@ import com.linkwechat.service.IWeCustomerTrajectoryService;
 import com.linkwechat.service.IWeMaterialService;
 import com.linkwechat.service.IWeMomentsService;
 import com.linkwechat.service.WeMomentsInteracteService;
-import com.sun.corba.se.impl.orbutil.concurrent.Sync;
-import org.springframework.amqp.AmqpException;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;

pom.xml

@@ -32,7 +32,7 @@
         <velocity.version>1.7</velocity.version>
         <jwt.version>0.9.0</jwt.version>
         <forest.version>1.5.24</forest.version>
-        <lombok.version>1.18.16</lombok.version>
+        <lombok.version>1.18.20</lombok.version>
         <reflectasm.version>1.11.9</reflectasm.version>
         <hutool.version>5.8.16</hutool.version>
         <zxing.version>3.3.3</zxing.version>