Merge branch 'master' into V20230915

# Conflicts:
#	dsk-operate-ui/src/views/market/index.vue
#	dsk-operate-ui/vue.config.js
#	dsk-system/src/main/java/com/dsk/system/service/impl/ISysTenantServiceImpl.java

dsk-admin/src/main/resources/application.yml

@@ -70,7 +70,7 @@ spring:
   # 资源信息
   messages:
     # 国际化资源文件路径
-    basename: i18n/messages
+    basename: i18n/messages_zh_CN
   profiles:
     active: @profiles.active@
   # 文件上传
@@ -195,7 +195,7 @@ mybatis-plus:
     # 更详细的日志输出 会有性能损耗 org.apache.ibatis.logging.stdout.StdOutImpl
     # 关闭日志记录 (可单纯使用 p6spy 分析) org.apache.ibatis.logging.nologging.NoLoggingImpl
     # 默认日志输出 org.apache.ibatis.logging.slf4j.Slf4jImpl
-    logImpl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    logImpl: org.apache.ibatis.logging.stdout.StdOutImpl
   global-config:
     # 是否打印 Logo banner
     banner: true

dsk-common/src/main/java/com/dsk/common/utils/ip/AddressUtils.java

@@ -20,14 +20,20 @@ public class AddressUtils {
     public static final String UNKNOWN = "XX XX";
 
     public static String getRealAddressByIP(String ip) {
-        if (StringUtils.isBlank(ip)) {
-            return UNKNOWN;
+        try {
+            if (StringUtils.isBlank(ip)) {
+                return UNKNOWN;
+            }
+            // 内网不查询
+            ip = "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : HtmlUtil.cleanHtmlTag(ip);
+            if (NetUtil.isInnerIP(ip)) {
+                return "内网IP";
+            }
+            return RegionUtils.getCityInfo(ip);
+        } catch (Exception e) {
+            log.error("IP地址异常 "+ip);
+            e.printStackTrace();
         }
-        // 内网不查询
-        ip = "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : HtmlUtil.cleanHtmlTag(ip);
-        if (NetUtil.isInnerIP(ip)) {
-            return "内网IP";
-        }
-        return RegionUtils.getCityInfo(ip);
+        return null;
     }
 }

dsk-operate-ui/.env.production

@@ -5,4 +5,4 @@ VUE_APP_TITLE = 数字化经营履约全生命链路管理系统
 ENV = 'production'
 
 # 数字化经营履约全生命链路管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'https://szhapi.jiansheku.com/'

dsk-operate-ui/operate.conf

 server
 {
 	listen 80;
-    server_name hwszh.jiansheku.com szh.jiansheku.com;
+    server_name hwszh.jiansheku.com szh.jiansheku.com szh-test.jiansheku.com;
     index index.php index.html index.htm default.php default.htm default.html;
     error_page 500 502 503 504 /50x.html;
-
+    set_real_ip_from 100.125.0.0/16;
+    real_ip_header X-Forwarded-For;
     access_log  /var/log/nginx/szh.jiansheku.com.access.log;
     error_log  /var/log/nginx/szh.jiansheku.com.error.log;
 
@@ -15,16 +16,6 @@ server
 		try_files $uri $uri/ /index.html;
 	}
 
-
-	 location /prod-api/ {
-          proxy_redirect off;
-          proxy_set_header Host $host;
-          proxy_set_header X-Real-IP $remote_addr;
-          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-          # 后端服务地址
-           proxy_pass http://localhost:9098/;
-  }
-
 	location = /50x.html {
 		root html;
 	}

dsk-operate-ui/src/router/index.js

@@ -180,7 +180,7 @@ export const constantRoutes = [
     children: [
       {
         path: '/company/:id',
-        component: () => import('@/views/detail'),
+        component: () => import('@/views/detail/party-b/index'),
         name: 'Company',
         meta: { title: '企业详情' }
       }

dsk-operate-ui/vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://47.104.91.229:9099/prod-api`,//测试
-        // target: `https://szhapi.jiansheku.com`,//线上
+        // target: `http://47.104.91.229:9099/prod-api`,//测试
+        target: `https://szhapi.jiansheku.com`,//测试
         // target: `http://122.9.160.122:9011`,  //线上
         // target: `http://192.168.0.165:9098`,//施
         // target: `http://192.168.60.6:9098`,//谭

dsk-system/src/main/java/com/dsk/system/service/SysLoginService.java

@@ -559,13 +559,13 @@ public class SysLoginService {
                 LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<SysUser>()
                     .select(SysUser::getUserName, SysUser::getStatus, SysUser::getTenantId)
                     .eq(SysUser::getPhonenumber, username)
-                    .orderByDesc(SysUser::getCreateTime);
+                    .orderByDesc(SysUser::getUserId);
                 sysUsers = userMapper.selectList(lqw);
             } else {
                 LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<SysUser>()
                     .select(SysUser::getUserName, SysUser::getStatus, SysUser::getTenantId)
                     .eq(SysUser::getUserName, username)
-                    .orderByDesc(SysUser::getCreateTime);
+                    .orderByDesc(SysUser::getUserId);
                 sysUsers = userMapper.selectList(lqw);
             }
             return sysUsers;

pom.xml

@@ -75,7 +75,7 @@
             <id>prod</id>
             <properties>
                 <profiles.active>prod</profiles.active>
-                <logging.level>warn</logging.level>
+                <logging.level>debug</logging.level>
             </properties>
         </profile>
     </profiles>