修改适配钉钉单点登录

base-buildpackage/src/main/resources/application-llg.yml

@@ -45,7 +45,7 @@ savefile:
   tomcatpath: /Users/apple/Desktop/log/local
   pluginpath: /Users/apple/Desktop/log/local
 zt:
-  url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
+  url: http://127.0.0.1:10086/kangarooDataCenterV3/entranceController/externalCallInterface
 cbs8:
   appId: 1P4AGrpz
   appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a
@@ -60,3 +60,5 @@ cbs8:
   elec_path: /Users/xiangerlin/Downloads/
 OA:
   data_source_code: yc_oa
+server:
+  port: 10086

base-service/src/main/java/com/hzya/frame/sysnew/login/impl/LoginServiceImpl.java

@@ -85,7 +85,10 @@ public class LoginServiceImpl implements ILoginService {
             return BaseResult.getFailureMessageEntity("请输入用户名或密码");
         }
         entity.setPassword(AESUtil.encrypt(entity.getLoginCode() + "-" + entity.getPassword()));
-        SysUserEntity sysUserEntity = sysUserDao.queryOne(entity);
+        SysUserEntity sysUserEntity = new SysUserEntity();
+        sysUserEntity.setLoginCode(entity.getLoginCode());
+        sysUserEntity.setPassword(entity.getPassword());
+        sysUserEntity = sysUserDao.queryOne(sysUserEntity);
         if (sysUserEntity == null || sysUserEntity.getId() == null || "".equals(sysUserEntity.getId())) {
             return BaseResult.getFailureMessageEntity("用户名或密码错误");
         }
@@ -169,6 +172,11 @@ public class LoginServiceImpl implements ILoginService {
     public JsonResultEntity appDoLogin(JSONObject jsonObject) {
         //移动端类型
         JSONObject entity = getData("jsonStr", jsonObject, JSONObject.class);
+        logger.error(entity.toString());
+        //boolean f = true;
+        //if(f){
+        //    return BaseResult.getFailureMessageEntity("cuowu",entity);
+        //}
         //DD,weChat
         String appType = entity.getString("appType");
         String appId = entity.getString("appId");

base-webapp/src/main/java/com/hzya/frame/webapp/web/corsconfig/CorsConfig.java

@@ -0,0 +1,24 @@
+package com.hzya.frame.webapp.web.corsconfig;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * @author 👻👻👻👻👻👻👻👻👻👻 gjh
+ * @version 1.0
+ * @content
+ * @date 2024-09-14 17:10
+ */
+@Configuration
+public class CorsConfig implements WebMvcConfigurer {
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("*")
+                .allowedMethods("GET", "POST", "PUT", "DELETE")
+                .allowedHeaders("*")
+                .allowCredentials(false);
+    }
+}

pom.xml

@@ -7,17 +7,17 @@
         <module>base-common</module>
         <module>base-webapp</module>
         <module>base-core</module>
-<!--        <module>fw-bip</module>-->
+        <module>fw-bip</module>
-<!--        <module>fw-cbs</module>-->
+        <module>fw-cbs</module>
-<!--        <module>fw-dd</module>-->
+        <module>fw-dd</module>
-<!--        <module>fw-grpU8</module>-->
+        <module>fw-grpU8</module>
-<!--        <module>fw-nc</module>-->
+        <module>fw-nc</module>
-<!--        <module>fw-ncc</module>-->
+        <module>fw-ncc</module>
-<!--        <module>fw-ningbobank</module>-->
+        <module>fw-ningbobank</module>
-<!--        <module>fw-oa</module>-->
+        <module>fw-oa</module>
-<!--        <module>fw-u8</module>-->
+        <module>fw-u8</module>
-<!--        <module>fw-u8c</module>-->
+        <module>fw-u8c</module>
-<!--        <module>fw-u9c</module>-->
+        <module>fw-u9c</module>
     </modules>
     <groupId>com.hzya.frame</groupId>
     <artifactId>kangarooDataCenterV3</artifactId>
@@ -464,6 +464,24 @@
                                 <include>**/*.jar</include>
                             </includes>
                         </resource>
+                        <resource>
+                            <directory>${basedir}/../fw-bip/src/main/webapp/WEB-INF/lib</directory>
+                            <targetPath>WEB-INF/lib/</targetPath>
+                            <filtering>false</filtering>
+                            <includes>
+                                <!-- 匹配所有jar包 -->
+                                <include>**/*.jar</include>
+                            </includes>
+                        </resource>
+                        <resource>
+                            <directory>${basedir}/../fw-ningbobank/src/main/webapp/WEB-INF/lib</directory>
+                            <targetPath>WEB-INF/lib/</targetPath>
+                            <filtering>false</filtering>
+                            <includes>
+                                <!-- 匹配所有jar包 -->
+                                <include>**/*.jar</include>
+                            </includes>
+                        </resource>
                     </webResources>
                 </configuration>
             </plugin>