fix

ruoyi-admin/src/main/resources/application-druid.yml

@@ -7,7 +7,7 @@ spring:
             # 主库数据源
             master:
 #                url: jdbc:mysql://192.168.101.226:3306/bm_project?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                url: jdbc:mysql://192.168.101.11:3306/bm_project?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.101.11:3306/zhibao?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: 123456
 #            # 从库数据源

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

@@ -16,7 +16,7 @@ ruoyi:
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
   # 图片预览路径
-  url: http://127.0.0.1:8080/file/preview
+  url: /file/preview
 
   amap-key: 2ea6ef6a023498f33b4e688c9e3f5195
   amap-decode-url: https://restapi.amap.com/v3/geocode/regeo?output=json&location={{LOCATION-KEY}}&key=${ruoyi.amap-key}&radius=1000&extensions=all
@@ -25,7 +25,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 100
   servlet:
     # 应用的访问路径
     context-path: /
@@ -70,7 +70,7 @@ spring:
       # 主库数据源
       master:
 #        url: jdbc:mysql://arenen.cn:3306/bm_project?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        url: jdbc:mysql://192.168.101.11:3306/bm_project?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://192.168.101.11:3306/zhibao?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
         password: 123456
 #        password: abc123+

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -47,7 +47,7 @@
     </resultMap>
 
     <sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u

ruoyi-ui/.env.development

@@ -8,4 +8,4 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 
 #端口
-Port = 8089
+Port = 101

ruoyi-ui/src/settings.js

@@ -28,6 +28,7 @@ module.exports = {
    * If you want to also use it in dev, you can pass ['production', 'development']
    */
   errorLog: 'production',
-  // apiUrl: 'http://192.168.101.11:8080'
-  apiUrl: 'http://36.7.89.102:8080'
+   apiUrl: ''
+   // apiUrl: 'http://192.168.101.11:100'
+  //apiUrl: 'http://36.7.89.102:8080'
 }

ruoyi-ui/vue.config.js

@@ -36,7 +36,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         target: `http://36.7.89.102:8080`,
-        // target: `http://192.168.101.11:8080`,
+        //  target: `http://192.168.101.11:100`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''