refactor(env): 更新环境配置并优化代码

baoshiwei

2025-05-24 3ad537052477fe31f45bd2e16045d58b35713bdc

refactor(env): 更新环境配置并优化代码

- 修改开发和生产环境中的数据库连接地址
- 更新 API 域名地址
- 调整 InfluxDB 主机地址
- 优化登录服务，增加权限获取逻辑
-修复模型信息获取逻辑
- 注释掉智能助手按钮
- 更新业务模型默认值
-调整单点登录逻辑
- 更新 Vite 配置中的代理地址

 zhitan-admin/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@
    druid:
      # 主库数据源
      master:
        url: jdbc:postgresql://127.0.0.1:5432/postgres
        url: jdbc:postgresql://192.168.0.24:5432/postgres
        username: postgres
        password: 123456
      # 从库数据源
@@ -65,5 +65,5 @@
  realm: lanbao
  client-id: DataCapture
  client-secret: kplisa4lJHEIM6knqefVbxln85QbA5NX
  redirect-uri: http://192.168.12.236:80/social-callback
  redirect-uri: http://192.168.0.24:8888/social-callback
  scopes: [openid, email, phone, profile]

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

@@ -12,7 +12,7 @@
  # 验证码类型 math 数字计算 char 字符验证
  captchaType: math
  # 域名地址
  domainName: https://demo-ems.zhitancloud.com/prod-api
  domainName: http://127.0.0.1:8088

# 开发环境配置
server:
@@ -142,7 +142,7 @@
    # 踢出之前登录的/之后登录的用户，默认踢出之前登录的用户
    kickoutAfter: false
rtdb:
  host: http://127.0.0.1:8086  # 用户名root 密码12345678
  host: http://192.168.0.24:8086  # 用户名root 密码12345678
  #token: AminQagYp5rjb09mFPYvriK0T0vlF-zmwboqtUzdcq3nkXNuhnEpMuG_Ht5vtfWC4xBIVOThvoxy5reTer9XcQ==
  token: i8WwVZz3RvkEVF3qGaY8uIDXTFEe2PzjgrKebDzcxlYGKnR-kOK5Hf1S5G4z3p-lc9UO7MQS4qKGL4lIeHSw1A==
  org: lanbao

 zhitan-framework/src/main/java/com/zhitan/framework/web/service/SysLoginService.java

@@ -64,6 +64,9 @@
    @Resource
    private ISysSocialService sysSocialService;

    @Resource
    private SysPermissionService permissionService;

    /**
     * 登录验证
     *
@@ -170,6 +173,7 @@
        LoginUser loginUser = new LoginUser();
        loginUser.setUser(userService.selectUserById(list.get(0).getUserId()));
        loginUser.setUserId(list.get(0).getUserId());
        loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
        // 生成token
        return tokenService.createToken(loginUser);
    }

 zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelInfoServiceImpl.java

@@ -148,10 +148,11 @@
      if (CollectionUtils.isNotEmpty(meterImplements)) {
        MeterImplement infor = meterImplements.get(0);
        indexName = infor.getInstallactionLocation() + "_" + infor.getMeterName() + "_" + indexName;
        pointData.setIndexName(indexName);
        pointData.setIndexId(indexInfo.getIndexId());
        voList.add(pointData);
      }
      pointData.setIndexName(indexName);
      pointData.setIndexId(indexInfo.getIndexId());
      voList.add(pointData);

    }
    return voList;
  }

 zhitan-vue/src/layout/index.vue

@@ -33,10 +33,10 @@
            </div>
            
            <!-- 大模型按钮 -->
            <div class="right-menu-item ai-btn" @click="openAIModel">
              <svg-icon icon-class="ai" class="right-menu-icon" />
              <span class="right-menu-text">智能助手</span>
            </div>
<!--            <div class="right-menu-item ai-btn" @click="openAIModel">-->
<!--              <svg-icon icon-class="ai" class="right-menu-icon" />-->
<!--              <span class="right-menu-text">智能助手</span>-->
<!--            </div>-->
          </div>
        </div>
      </div>

 zhitan-vue/src/views/login.vue

@@ -211,10 +211,10 @@
  });
};
// 非单点登录放开下边两行，否则注释掉
getCode()
getCookie()
// getCode()
// getCookie()
// 单点登录放开下边一行，否则注释掉
// doSocialLogin()
doSocialLogin()
</script>

<style lang="scss" scoped>

 zhitan-vue/src/views/modelconfiguration/businessmodel/businessModel.vue

@@ -126,7 +126,7 @@
    modelInfoOptions.value = response.data
    if (flag) {
      if (modelInfoOptions.value.length > 0) {
        modelData.value = modelInfoOptions.value[1].modelCode
        modelData.value = modelInfoOptions.value[0].modelCode
        getTreeList(modelData.value)
      }
    }

 zhitan-vue/src/views/svg/equipmentfile/index.vue

@@ -70,7 +70,7 @@
import { useRoute } from "vue-router"
let { proxy } = getCurrentInstance()
let treeLoading = ref(true)
let modelData = ref(null)
let modelData = ref('LBJT')
let modelInfoOptions = ref([]) //下拉列表
const configureViewRef = ref()
//获取下拉列表

 zhitan-vue/vite.config.js

@@ -33,12 +33,12 @@
      proxy: {
        // https://cn.vitejs.dev/config/#server-proxy
        "/dev-api": {
          target: "http://localhost:8080",
          target: "http://localhost:8088",
          changeOrigin: true,
          rewrite: (p) => p.replace(/^\/dev-api/, "/"),
        },
        "/prod-api": {
          target: "http://localhost:8080",
          target: "http://localhost:8088",
          changeOrigin: true,
          secure: true,
        },